diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c02f49ef71f6..5d9ccac1a6f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,15 +39,9 @@ jobs: python -m tools.ci.check_icon_conflicts python -m tools.ci.check_icon_dupenames python -m tools.maplint.source --github - DREAMCHECKER_EXIT_CODE=0 - ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 || DREAMCHECKER_EXIT_CODE=$? - echo 'DREAMCHECKER_ANNOTATED=1' >> "$GITHUB_ENV" - exit $DREAMCHECKER_EXIT_CODE - - name: Annotate Lints - uses: yogstation13/DreamAnnotate@v2 - if: ${{ always() && env.DREAMCHECKER_ANNOTATED == '1' }} - with: - outputFile: output-annotations.txt + - name: Run DreamChecker + shell: bash + run: ~/dreamchecker 2>&1 | bash tools/ci/annotate_dm.sh odlint: name: Lint with OpenDream diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 058f897b55b6..5f1927b74e89 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -1,6 +1,6 @@ # This file has all the information on what versions of libraries are thrown into the code # For dreamchecker -export SPACEMANDMM_TAG=suite-1.7.1 +export SPACEMANDMM_TAG=suite-1.8 # For TGUI export NODE_VERSION=20 # Stable Byond Major diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 6201efae4930..0520abc37123 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1372,7 +1372,7 @@ /obj/structure/lattice, /obj/machinery/light/small, /turf/space, -/area/space/nearstation) +/area/space/nearstation/centcom) "fr" = ( /obj/docking_port/stationary/transit{ dir = 4; @@ -4568,7 +4568,7 @@ /area/shuttle/administration) "ps" = ( /turf/simulated/mineral/ancient/outer, -/area/space/nearstation) +/area/space/nearstation/centcom) "pt" = ( /obj/machinery/door/airlock/hatch{ name = "Armory" @@ -5803,7 +5803,7 @@ "tL" = ( /obj/structure/lattice, /turf/space, -/area/space/nearstation) +/area/space/nearstation/centcom) "tM" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 @@ -7018,7 +7018,7 @@ "ya" = ( /obj/effect/mob_spawn/human/corpse/clown/corpse, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "yc" = ( /obj/structure/table/reinforced, /obj/item/lighter/zippo/contractor, @@ -7029,7 +7029,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "yg" = ( /mob/living/silicon/decoy{ name = "A.L.I.C.E." @@ -7110,7 +7110,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "yL" = ( /obj/machinery/computer/card, /turf/simulated/floor/plasteel, @@ -10851,7 +10851,7 @@ "Mu" = ( /obj/item/coin/antagtoken, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "Mv" = ( /obj/machinery/recharge_station/upgraded, /turf/simulated/floor/plasteel{ @@ -11598,7 +11598,7 @@ /area/shuttle/escape) "OK" = ( /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "OL" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -13971,7 +13971,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "Xt" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Customs" @@ -14329,7 +14329,7 @@ "YI" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "YJ" = ( /obj/machinery/door/window/classic/normal{ name = "Cell B"; diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index f0102f850792..7b2128d54ef4 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -2296,7 +2296,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "bJO" = ( /obj/structure/fans/tiny/invisible, /obj/structure/marker_beacon/dock_marker/collision, @@ -8040,7 +8040,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "fqZ" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen/double/vox, @@ -8816,7 +8816,7 @@ "fVA" = ( /obj/effect/mob_spawn/human/corpse/clown/corpse, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "fVW" = ( /turf/simulated/floor/beach/away/coastline{ water_overlay_image = null @@ -8927,7 +8927,7 @@ /area/shuttle/syndicate) "fYV" = ( /turf/simulated/mineral/ancient/outer, -/area/space/nearstation) +/area/space/nearstation/centcom) "fZS" = ( /obj/machinery/computer/account_database{ name = "Admin Accounts Database"; @@ -14423,7 +14423,7 @@ /obj/structure/lattice, /obj/structure/light_fake/small, /turf/space, -/area/space/nearstation) +/area/space/nearstation/centcom) "jKB" = ( /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel{ @@ -16323,7 +16323,7 @@ /turf/simulated/floor/plating/airless{ icon_state = "asteroidplating" }, -/area/space/nearstation) +/area/space/nearstation/centcom) "lkx" = ( /obj/machinery/door/airlock/hatch/syndicate{ name = "Syndicate Base" @@ -18506,7 +18506,7 @@ /obj/structure/marker_beacon/dock_marker, /obj/structure/lattice/catwalk, /turf/space, -/area/space/nearstation) +/area/space/nearstation/centcom) "mBD" = ( /obj/machinery/door/airlock/hatch/syndicate/command{ name = "Тюрьма"; @@ -20133,7 +20133,7 @@ /area/syndicate_mothership/elite_squad) "nNr" = ( /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "nNB" = ( /obj/structure/bookcase/manuals/research_and_development, /turf/simulated/floor/wood/oak, @@ -22343,7 +22343,7 @@ "pxm" = ( /obj/item/coin/antagtoken, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "pxu" = ( /obj/effect/turf_decal/siding/black{ dir = 8 @@ -22703,7 +22703,7 @@ "pLx" = ( /obj/effect/decal/remains/human, /turf/simulated/floor/plating/asteroid/ancient/airless, -/area/space/nearstation) +/area/space/nearstation/centcom) "pMa" = ( /obj/machinery/computer/shuttle/syndicate/drop_pod, /turf/simulated/wall/mineral/plastitanium, @@ -27166,7 +27166,7 @@ "sQi" = ( /obj/structure/lattice, /turf/space, -/area/space/nearstation) +/area/space/nearstation/centcom) "sQk" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index cab2662a7ec6..602c4e261a85 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -133,3 +133,5 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( ))) #define ispassmeteorturf(A) (is_type_in_typecache(A, GLOB.turfs_pass_meteor)) + +#define is_screen_atom(A) istype(A, /atom/movable/screen) diff --git a/code/__DEFINES/reagents_defines.dm b/code/__DEFINES/reagents_defines.dm index 14f796da040d..7dfe52837b15 100644 --- a/code/__DEFINES/reagents_defines.dm +++ b/code/__DEFINES/reagents_defines.dm @@ -29,3 +29,6 @@ #define SYRINGE_DRAW 0 #define SYRINGE_INJECT 1 #define SYRINGE_BROKEN 2 + +/// Like O- blood but doesn't contribute to blood_volume or vampire nutrition +#define BLOOD_TYPE_FAKE_BLOOD "Vh Null" diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index d5d3a6f26463..4f185e0f70a4 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -112,6 +112,7 @@ #define STATUS_EFFECT_MAGIC_DISGUISE /datum/status_effect/magic_disguise +#define STATUS_EFFECT_PEPPERSPRAYED /datum/status_effect/pepper_spray //#define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse //#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index ce60b238e612..e4e1b7930b5a 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -345,14 +345,6 @@ return candidates -/proc/ScreenText(obj/O, maptext="", screen_loc="CENTER-7,CENTER-7", maptext_height=480, maptext_width=480) - if(!isobj(O)) O = new /obj/screen/text() - O.maptext = maptext - O.maptext_height = maptext_height - O.maptext_width = maptext_width - O.screen_loc = screen_loc - return O - /proc/remove_images_from_clients(image/I, list/show_to) for(var/client/C in show_to) C.images -= I diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2389b37031e7..9191e1df7adb 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -744,7 +744,8 @@ Returns 1 if the chain up to the area contains the given typepath atoms += A return atoms -/datum/coords //Simple datum for storing coordinates. +/// Simple datum for storing coordinates. +/datum/coords var/x_pos var/y_pos var/z_pos diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 91e889369037..4369d535fce4 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -463,23 +463,23 @@ else direction = WEST dir = direction -/obj/screen/click_catcher +/atom/movable/screen/click_catcher icon = 'icons/mob/screen_gen.dmi' icon_state = "catcher" plane = CLICKCATCHER_PLANE mouse_opacity = MOUSE_OPACITY_OPAQUE screen_loc = "CENTER" -/obj/screen/click_catcher/MouseEntered(location, control, params) +/atom/movable/screen/click_catcher/MouseEntered(location, control, params) return -/obj/screen/click_catcher/MouseExited(location, control, params) +/atom/movable/screen/click_catcher/MouseExited(location, control, params) return #define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size) #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose. -/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) +/atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher") var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x) var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y) @@ -494,7 +494,7 @@ M.Scale(px/sx, py/sy) transform = M -/obj/screen/click_catcher/Click(location, control, params) +/atom/movable/screen/click_catcher/Click(location, control, params) var/list/modifiers = params2list(params) if(modifiers["middle"] && iscarbon(usr)) var/mob/living/carbon/C = usr diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 5d7d41143320..420e9d4d9fa7 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -28,7 +28,7 @@ FALSE if not return var/lagging = could_be_click_lag() drag_start = 0 - if(!(istype(over, /obj/screen) || (loc && loc == over.loc))) + if(!(is_screen_atom(over) || (loc && loc == over.loc))) if(!Adjacent(usr) || !over.Adjacent(usr)) // should stop you from dragging through windows if(lagging) usr.ClickOn(src, params) diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 2ff53932b0ce..3f8812e93686 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -1,4 +1,4 @@ -/obj/screen/movable/action_button +/atom/movable/screen/movable/action_button desc = "CTRL-Shift click on this button to bind it to a hotkey." var/datum/action/linked_action var/actiontooltipstyle = "" @@ -6,7 +6,7 @@ var/ordered = TRUE var/datum/keybinding/mob/trigger_action_button/linked_keybind -/obj/screen/movable/action_button/MouseDrop(over_object) +/atom/movable/screen/movable/action_button/MouseDrop(over_object) if(locked && could_be_click_lag()) // in case something bad happend and game realised we dragged our ability instead of pressing it Click() drag_start = 0 @@ -16,8 +16,8 @@ to_chat(usr, "Action button \"[name]\" is locked, unlock it first.") closeToolTip(usr) return - if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle))) - var/obj/screen/movable/action_button/B = over_object + if((istype(over_object, /atom/movable/screen/movable/action_button) && !istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle))) + var/atom/movable/screen/movable/action_button/B = over_object var/list/actions = usr.actions actions.Swap(actions.Find(linked_action), actions.Find(B.linked_action)) moved = FALSE @@ -26,13 +26,13 @@ B.ordered = TRUE closeToolTip(usr) usr.update_action_buttons() - else if(istype(over_object, /obj/screen/movable/action_button/hide_toggle)) + else if(istype(over_object, /atom/movable/screen/movable/action_button/hide_toggle)) closeToolTip(usr) else closeToolTip(usr) return ..() -/obj/screen/movable/action_button/Click(location,control,params) +/atom/movable/screen/movable/action_button/Click(location, control, params) var/list/modifiers = params2list(params) if(modifiers["ctrl"] && modifiers["shift"]) INVOKE_ASYNC(src, PROC_REF(set_to_keybind), usr) @@ -63,7 +63,7 @@ animate(src, transform = matrix(), time = 0.4 SECONDS, alpha = 255) return TRUE -/obj/screen/movable/action_button/proc/set_to_keybind(mob/user) +/atom/movable/screen/movable/action_button/proc/set_to_keybind(mob/user) var/keybind_to_set_to = uppertext(input(user, "What keybind do you want to set this action button to?") as text) if(keybind_to_set_to) if(linked_keybind) @@ -78,10 +78,10 @@ clean_up_keybinds(user) to_chat(user, "Your active keybinding on [src] has been cleared.") -/obj/screen/movable/action_button/AltClick(mob/user) +/atom/movable/screen/movable/action_button/AltClick(mob/user) return linked_action.AltTrigger() -/obj/screen/movable/action_button/proc/clean_up_keybinds(mob/owner) +/atom/movable/screen/movable/action_button/proc/clean_up_keybinds(mob/owner) if(linked_keybind) owner.client.active_keybindings[linked_keybind.binded_to] -= (linked_keybind) if(!length(owner.client.active_keybindings[linked_keybind.binded_to])) @@ -90,21 +90,21 @@ QDEL_NULL(linked_keybind) //Hide/Show Action Buttons ... Button -/obj/screen/movable/action_button/hide_toggle +/atom/movable/screen/movable/action_button/hide_toggle name = "Hide Buttons" desc = "Shift-click any button to reset its position, and Control-click it to lock/unlock its position. Alt-click this button to reset all buttons to their default positions." icon = 'icons/mob/actions/actions.dmi' icon_state = "bg_default" var/hidden = FALSE -/obj/screen/movable/action_button/hide_toggle/MouseDrop(over_object) - if(istype(over_object, /obj/screen/movable/action_button)) +/atom/movable/screen/movable/action_button/hide_toggle/MouseDrop(over_object) + if(istype(over_object, /atom/movable/screen/movable/action_button)) closeToolTip(usr) else closeToolTip(usr) return ..() -/obj/screen/movable/action_button/hide_toggle/Click(location,control,params) +/atom/movable/screen/movable/action_button/hide_toggle/Click(location, control, params) var/list/modifiers = params2list(params) if(modifiers["alt"]) @@ -121,17 +121,17 @@ update_icon(UPDATE_OVERLAYS) usr.update_action_buttons() -/obj/screen/movable/action_button/hide_toggle/AltClick(mob/user) +/atom/movable/screen/movable/action_button/hide_toggle/AltClick(mob/user) for(var/V in user.actions) var/datum/action/A = V - var/obj/screen/movable/action_button/B = A.button + var/atom/movable/screen/movable/action_button/B = A.button B.moved = FALSE if(moved) moved = FALSE user.update_action_buttons(TRUE) to_chat(user, "Action button positions have been reset.") -/obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) +/atom/movable/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) if(isalien(user)) icon = 'icons/mob/actions/actions.dmi' icon_state = "bg_alien" @@ -146,13 +146,13 @@ color = user.client.prefs.UI_style_color update_icon(UPDATE_OVERLAYS) -/obj/screen/movable/action_button/hide_toggle/update_overlays() +/atom/movable/screen/movable/action_button/hide_toggle/update_overlays() . = ..() var/image/img = image(initial(icon), src, hidden ? "show" : "hide") img.appearance_flags = RESET_COLOR | RESET_ALPHA . += img -/obj/screen/movable/action_button/MouseEntered(location, control, params) +/atom/movable/screen/movable/action_button/MouseEntered(location, control, params) . = ..() if(!QDELETED(src)) if(!linked_keybind) @@ -164,7 +164,7 @@ desc_information = desc_information.Join(" ") openToolTip(usr, src, params, title = name, content = desc_information, theme = actiontooltipstyle) -/obj/screen/movable/action_button/MouseExited() +/atom/movable/screen/movable/action_button/MouseExited() closeToolTip(usr) /mob/proc/update_action_buttons_icon() @@ -192,7 +192,7 @@ A.override_location() // If the action has a location override, call it A.UpdateButtonIcon() - var/obj/screen/movable/action_button/B = A.button + var/atom/movable/screen/movable/action_button/B = A.button if(B.ordered) button_number++ if(!B.moved) @@ -227,7 +227,7 @@ return "WEST[coord_col]:[coord_col_offset],NORTH[coord_row]:-6" -/datum/hud/proc/SetButtonCoords(obj/screen/button,number) +/datum/hud/proc/SetButtonCoords(atom/movable/screen/button,number) var/row = round((number-1)/AB_MAX_COLUMNS) var/col = ((number - 1)%(AB_MAX_COLUMNS)) + 1 var/x_offset = 32*(col-1) + 4 + 2*col diff --git a/code/_onclick/hud/ai_hud.dm b/code/_onclick/hud/ai_hud.dm index 8579060078bf..918cfa8d432c 100644 --- a/code/_onclick/hud/ai_hud.dm +++ b/code/_onclick/hud/ai_hud.dm @@ -1,138 +1,138 @@ -/obj/screen/ai +/atom/movable/screen/ai icon = 'icons/mob/screen_ai.dmi' -/obj/screen/ai/aicore +/atom/movable/screen/ai/aicore name = "AI core" icon_state = "ai_core" -/obj/screen/ai/aicore/Click() +/atom/movable/screen/ai/aicore/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.view_core() -/obj/screen/ai/camera_list +/atom/movable/screen/ai/camera_list name = "Show Camera List" icon_state = "camera" -/obj/screen/ai/camera_list/Click() +/atom/movable/screen/ai/camera_list/Click() var/mob/living/silicon/ai/AI = usr var/camera = tgui_input_list(AI, "Choose which camera you want to view", "Cameras", AI.get_camera_list()) AI.ai_camera_list(camera) -/obj/screen/ai/camera_track +/atom/movable/screen/ai/camera_track name = "Track With Camera" icon_state = "track" -/obj/screen/ai/camera_track/Click() +/atom/movable/screen/ai/camera_track/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr var/target_name = tgui_input_list(AI, "Choose a target you want to track", "Tracking", AI.trackable_mobs()) if(target_name) AI.ai_camera_track(target_name) -/obj/screen/ai/camera_light +/atom/movable/screen/ai/camera_light name = "Toggle Camera Light" icon_state = "camera_light" -/obj/screen/ai/camera_light/Click() +/atom/movable/screen/ai/camera_light/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.toggle_camera_light() -/obj/screen/ai/crew_monitor +/atom/movable/screen/ai/crew_monitor name = "Crew Monitoring Console" icon_state = "crew_monitor" -/obj/screen/ai/crew_monitor/Click() +/atom/movable/screen/ai/crew_monitor/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.subsystem_crew_monitor() -/obj/screen/ai/crew_manifest +/atom/movable/screen/ai/crew_manifest name = "Crew Manifest" icon_state = "manifest" -/obj/screen/ai/crew_manifest/Click() +/atom/movable/screen/ai/crew_manifest/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.ai_roster() -/obj/screen/ai/alerts +/atom/movable/screen/ai/alerts name = "Show Alerts" icon_state = "alerts" -/obj/screen/ai/alerts/Click() +/atom/movable/screen/ai/alerts/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.ai_alerts() -/obj/screen/ai/announcement +/atom/movable/screen/ai/announcement name = "Make Announcement" icon_state = "announcement" -/obj/screen/ai/announcement/Click() +/atom/movable/screen/ai/announcement/Click() var/mob/living/silicon/ai/AI = usr AI.announcement() -/obj/screen/ai/call_shuttle +/atom/movable/screen/ai/call_shuttle name = "Call Emergency Shuttle" icon_state = "call_shuttle" -/obj/screen/ai/call_shuttle/Click() +/atom/movable/screen/ai/call_shuttle/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.ai_call_shuttle() -/obj/screen/ai/state_laws +/atom/movable/screen/ai/state_laws name = "Law Manager" icon_state = "state_laws" -/obj/screen/ai/state_laws/Click() +/atom/movable/screen/ai/state_laws/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.subsystem_law_manager() -/obj/screen/ai/pda_msg_send +/atom/movable/screen/ai/pda_msg_send name = "PDA - Send Message" icon_state = "pda_send" -/obj/screen/ai/pda_msg_send/Click() +/atom/movable/screen/ai/pda_msg_send/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aiPDA.cmd_send_pdamesg() -/obj/screen/ai/pda_msg_show +/atom/movable/screen/ai/pda_msg_show name = "PDA - Show Message Log" icon_state = "pda_receive" -/obj/screen/ai/pda_msg_show/Click() +/atom/movable/screen/ai/pda_msg_show/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aiPDA.cmd_show_message_log() -/obj/screen/ai/image_take +/atom/movable/screen/ai/image_take name = "Take Image" icon_state = "take_picture" -/obj/screen/ai/image_take/Click() +/atom/movable/screen/ai/image_take/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aiCamera.toggle_camera_mode() -/obj/screen/ai/image_view +/atom/movable/screen/ai/image_view name = "View Images" icon_state = "view_images" -/obj/screen/ai/image_view/Click() +/atom/movable/screen/ai/image_view/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.aiCamera.viewpictures() -/obj/screen/ai/sensors +/atom/movable/screen/ai/sensors name = "Toggle Sensor Augmentation" icon_state = "ai_sensor" -/obj/screen/ai/sensors/Click() +/atom/movable/screen/ai/sensors/Click() if(isAI(usr)) var/mob/living/silicon/ai/AI = usr AI.sensor_mode() @@ -147,89 +147,89 @@ /datum/hud/ai/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.screen_loc = ui_borg_lanugage_menu static_inventory += using //AI core - using = new /obj/screen/ai/aicore() + using = new /atom/movable/screen/ai/aicore() using.screen_loc = ui_ai_core static_inventory += using //Camera list - using = new /obj/screen/ai/camera_list() + using = new /atom/movable/screen/ai/camera_list() using.screen_loc = ui_ai_camera_list static_inventory += using //Track - using = new /obj/screen/ai/camera_track() + using = new /atom/movable/screen/ai/camera_track() using.screen_loc = ui_ai_track_with_camera static_inventory += using //Camera light - using = new /obj/screen/ai/camera_light() + using = new /atom/movable/screen/ai/camera_light() using.screen_loc = ui_ai_camera_light static_inventory += using //Crew Monitorting - using = new /obj/screen/ai/crew_monitor() + using = new /atom/movable/screen/ai/crew_monitor() using.screen_loc = ui_ai_crew_monitor static_inventory += using //Crew Manifest - using = new /obj/screen/ai/crew_manifest() + using = new /atom/movable/screen/ai/crew_manifest() using.screen_loc = ui_ai_crew_manifest static_inventory += using //Alerts - using = new /obj/screen/ai/alerts() + using = new /atom/movable/screen/ai/alerts() using.screen_loc = ui_ai_alerts static_inventory += using //Announcement - using = new /obj/screen/ai/announcement() + using = new /atom/movable/screen/ai/announcement() using.screen_loc = ui_ai_announcement static_inventory += using //Shuttle - using = new /obj/screen/ai/call_shuttle() + using = new /atom/movable/screen/ai/call_shuttle() using.screen_loc = ui_ai_shuttle static_inventory += using //Laws - using = new /obj/screen/ai/state_laws() + using = new /atom/movable/screen/ai/state_laws() using.screen_loc = ui_ai_state_laws static_inventory += using //PDA message - using = new /obj/screen/ai/pda_msg_send() + using = new /atom/movable/screen/ai/pda_msg_send() using.screen_loc = ui_ai_pda_send static_inventory += using //PDA log - using = new /obj/screen/ai/pda_msg_show() + using = new /atom/movable/screen/ai/pda_msg_show() using.screen_loc = ui_ai_pda_log static_inventory += using //Take image - using = new /obj/screen/ai/image_take() + using = new /atom/movable/screen/ai/image_take() using.screen_loc = ui_ai_take_picture static_inventory += using //View images - using = new /obj/screen/ai/image_view() + using = new /atom/movable/screen/ai/image_view() using.screen_loc = ui_ai_view_images static_inventory += using //Medical/Security sensors - using = new /obj/screen/ai/sensors() + using = new /atom/movable/screen/ai/sensors() using.screen_loc = ui_ai_sensor static_inventory += using //Intent - using = new /obj/screen/act_intent/robot/AI() + using = new /atom/movable/screen/act_intent/robot/AI() using.icon_state = mymob.a_intent static_inventory += using action_intent = using diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 5385f46078cc..66e7af873a3e 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -21,7 +21,7 @@ if(!category) return - var/obj/screen/alert/alert = LAZYACCESS(alerts, category) + var/atom/movable/screen/alert/alert = LAZYACCESS(alerts, category) if(alert) if(alert.override_alerts) return 0 @@ -75,14 +75,14 @@ var/timeout = timeout_override || alert.timeout if(timeout) - addtimer(CALLBACK(alert, TYPE_PROC_REF(/obj/screen/alert, do_timeout), src, category), timeout) + addtimer(CALLBACK(alert, TYPE_PROC_REF(/atom/movable/screen/alert, do_timeout), src, category), timeout) alert.timeout = world.time + timeout - world.tick_lag return alert // Proc to clear an existing alert. /mob/proc/clear_alert(category, clear_override = FALSE) - var/obj/screen/alert/alert = LAZYACCESS(alerts, category) + var/atom/movable/screen/alert/alert = LAZYACCESS(alerts, category) if(!alert) return 0 if(alert.override_alerts && !clear_override) @@ -94,7 +94,7 @@ client.screen -= alert qdel(alert) -/obj/screen/alert +/atom/movable/screen/alert icon = 'icons/mob/screen_alert.dmi' icon_state = "default" name = "Alert" @@ -105,16 +105,16 @@ var/alerttooltipstyle = "" var/override_alerts = FALSE //If it is overriding other alerts of the same type -/obj/screen/alert/MouseEntered(location,control,params) +/atom/movable/screen/alert/MouseEntered(location, control, params) . = ..() openToolTip(usr, src, params, title = name, content = desc, theme = alerttooltipstyle) -/obj/screen/alert/MouseExited() +/atom/movable/screen/alert/MouseExited() closeToolTip(usr) return ..() -/obj/screen/alert/proc/do_timeout(mob/M, category) +/atom/movable/screen/alert/proc/do_timeout(mob/M, category) if(!M || !M.alerts) return @@ -122,42 +122,42 @@ M.clear_alert(category) //Gas alerts -/obj/screen/alert/not_enough_oxy +/atom/movable/screen/alert/not_enough_oxy name = "Choking (No O2)" desc = "You're not getting enough oxygen. Find some good air before you pass out! The box in your backpack has an oxygen tank and breath mask in it." icon_state = "not_enough_oxy" -/obj/screen/alert/too_much_oxy +/atom/movable/screen/alert/too_much_oxy name = "Choking (O2)" desc = "There's too much oxygen in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_oxy" -/obj/screen/alert/not_enough_nitro +/atom/movable/screen/alert/not_enough_nitro name = "Choking (No N2)" desc = "You're not getting enough nitrogen. Find some good air before you pass out!" icon_state = "not_enough_nitro" -/obj/screen/alert/too_much_nitro +/atom/movable/screen/alert/too_much_nitro name = "Choking (N2)" desc = "There's too much nitrogen in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_nitro" -/obj/screen/alert/not_enough_co2 +/atom/movable/screen/alert/not_enough_co2 name = "Choking (No CO2)" desc = "You're not getting enough carbon dioxide. Find some good air before you pass out!" icon_state = "not_enough_co2" -/obj/screen/alert/too_much_co2 +/atom/movable/screen/alert/too_much_co2 name = "Choking (CO2)" desc = "There's too much carbon dioxide in the air, and you're breathing it in! Find some good air before you pass out!" icon_state = "too_much_co2" -/obj/screen/alert/not_enough_tox +/atom/movable/screen/alert/not_enough_tox name = "Choking (No Plasma)" desc = "You're not getting enough plasma. Find some good air before you pass out!" icon_state = "not_enough_tox" -/obj/screen/alert/too_much_tox +/atom/movable/screen/alert/too_much_tox name = "Choking (Plasma)" desc = "There's highly flammable, toxic plasma in the air and you're breathing it in. Find some fresh air. The box in your backpack has an oxygen tank and gas mask in it." icon_state = "too_much_tox" @@ -165,161 +165,161 @@ // Hunger alerts -/obj/screen/alert/hunger +/atom/movable/screen/alert/hunger icon = 'icons/mob/screen_hunger.dmi' -/obj/screen/alert/hunger/fat +/atom/movable/screen/alert/hunger/fat name = "Fat" desc = "You ate too much food, lardass. Run around the station and lose some weight." icon_state = "fat" -/obj/screen/alert/hunger/full +/atom/movable/screen/alert/hunger/full name = "Full" desc = "You feel full and satisfied, but you shouldn't eat much more." icon_state = "full" -/obj/screen/alert/hunger/well_fed +/atom/movable/screen/alert/hunger/well_fed name = "Well Fed" desc = "You feel quite satisfied, but you may be able to eat a bit more." icon_state = "well_fed" -/obj/screen/alert/hunger/fed +/atom/movable/screen/alert/hunger/fed name = "Fed" desc = "You feel moderately satisfied, but a bit more food may not hurt." icon_state = "fed" -/obj/screen/alert/hunger/hungry +/atom/movable/screen/alert/hunger/hungry name = "Hungry" desc = "Some food would be good right about now." icon_state = "hungry" -/obj/screen/alert/hunger/starving +/atom/movable/screen/alert/hunger/starving name = "Starving" desc = "You're severely malnourished. The hunger pains make moving around a chore." icon_state = "starving" /// Machine "hunger" -/obj/screen/alert/hunger/fat/machine +/atom/movable/screen/alert/hunger/fat/machine name = "Over Charged" desc = "Your cell has excessive charge due to electrical shocks. Run around the station and spend some energy." -/obj/screen/alert/hunger/full/machine +/atom/movable/screen/alert/hunger/full/machine name = "Full Charge" desc = "Your cell is at full charge. Might want to give APCs some space." -/obj/screen/alert/hunger/well_fed/machine +/atom/movable/screen/alert/hunger/well_fed/machine name = "High Charge" desc = "You're almost all charged, but could top up a bit more." -/obj/screen/alert/hunger/fed/machine +/atom/movable/screen/alert/hunger/fed/machine name = "Half Charge" desc = "You feel moderately charged, but a bit more juice couldn't hurt." -/obj/screen/alert/hunger/hungry/machine +/atom/movable/screen/alert/hunger/hungry/machine name = "Low Charge" desc = "Could use a little charging right about now." -/obj/screen/alert/hunger/starving/machine +/atom/movable/screen/alert/hunger/starving/machine name = "Nearly Discharged" desc = "You're almost drained. The low power makes moving around a chore." // End of Machine "hunger" ///Vampire "hunger" -/obj/screen/alert/hunger/fat/vampire +/atom/movable/screen/alert/hunger/fat/vampire desc = "You somehow drank too much blood, lardass. Run around the station and lose some weight." -/obj/screen/alert/hunger/full/vampire +/atom/movable/screen/alert/hunger/full/vampire desc = "You feel full and satisfied, but you know you will thirst for more blood soon..." -/obj/screen/alert/hunger/well_fed/vampire +/atom/movable/screen/alert/hunger/well_fed/vampire desc = "You feel quite satisfied, but you could do with a bit more blood." -/obj/screen/alert/hunger/fed/vampire +/atom/movable/screen/alert/hunger/fed/vampire desc = "You feel moderately satisfied, but a bit more blood wouldn't hurt." -/obj/screen/alert/hunger/hungry/vampire +/atom/movable/screen/alert/hunger/hungry/vampire desc = "You currently thirst for blood." -/obj/screen/alert/hunger/starving/vampire +/atom/movable/screen/alert/hunger/starving/vampire desc = "You're severely thirsty. The thirst pains make moving around a chore." //End of Vampire "hunger" -/obj/screen/alert/hot +/atom/movable/screen/alert/hot name = "Too Hot" desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit." icon_state = "hot" -/obj/screen/alert/hot/robot +/atom/movable/screen/alert/hot/robot desc = "The air around you is too hot for a humanoid. Be careful to avoid exposing them to this environment." -/obj/screen/alert/cold +/atom/movable/screen/alert/cold name = "Too Cold" desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit." icon_state = "cold" -/obj/screen/alert/cold/drask +/atom/movable/screen/alert/cold/drask name = "Cold" desc = "You're breathing supercooled gas! It's stimulating your metabolism to regenerate damaged tissue." -/obj/screen/alert/cold/robot +/atom/movable/screen/alert/cold/robot desc = "The air around you is too cold for a humanoid. Be careful to avoid exposing them to this environment." -/obj/screen/alert/lowpressure +/atom/movable/screen/alert/lowpressure name = "Low Pressure" desc = "The air around you is hazardously thin. A space suit would protect you." icon_state = "lowpressure" -/obj/screen/alert/highpressure +/atom/movable/screen/alert/highpressure name = "High Pressure" desc = "The air around you is hazardously thick. A fire suit would protect you." icon_state = "highpressure" -/obj/screen/alert/lightexposure +/atom/movable/screen/alert/lightexposure name = "Light Exposure" desc = "You're exposed to light." icon_state = "lightexposure" -/obj/screen/alert/nolight +/atom/movable/screen/alert/nolight name = "No Light" desc = "You're not exposed to any light." icon_state = "nolight" -/obj/screen/alert/blind +/atom/movable/screen/alert/blind name = "Blind" desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, \ or something covering your eyes." icon_state = "blind" -/obj/screen/alert/high +/atom/movable/screen/alert/high name = "High" desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already." icon_state = "high" -/obj/screen/alert/drunk +/atom/movable/screen/alert/drunk name = "Drunk" desc = "All that alcohol you've been drinking is impairing your speech, motor skills, and mental cognition." icon_state = "drunk" -/obj/screen/alert/embeddedobject +/atom/movable/screen/alert/embeddedobject name = "Embedded Object" desc = "Something got lodged into your flesh and is causing major bleeding. It might fall out with time, but surgery is the safest way. \ If you're feeling frisky, click yourself in help intent to pull the object out." icon_state = "embeddedobject" -/obj/screen/alert/embeddedobject/Click() +/atom/movable/screen/alert/embeddedobject/Click() if(isliving(usr)) var/mob/living/carbon/human/M = usr return M.help_shake_act(M) -/obj/screen/alert/asleep +/atom/movable/screen/alert/asleep name = "Asleep" desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are." icon_state = "asleep" -/obj/screen/alert/weightless +/atom/movable/screen/alert/weightless name = "Weightless" desc = "Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a \ wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of \ @@ -327,48 +327,48 @@ magboots would let you walk around normally on the floor. Barring those, you can or shoot a gun to move around via Newton's 3rd Law of Motion." icon_state = "weightless" -/obj/screen/alert/fire +/atom/movable/screen/alert/fire name = "On Fire" desc = "You're on fire. Stop, drop and roll to put the fire out or move to a vacuum area." icon_state = "fire" -/obj/screen/alert/fire/Click() +/atom/movable/screen/alert/fire/Click() if(isliving(usr)) var/mob/living/L = usr return L.resist() -/obj/screen/alert/direction_lock +/atom/movable/screen/alert/direction_lock name = "Direction Lock" desc = "You are facing only one direction, slowing your movement down. Click here to stop the direction lock." icon_state = "direction_lock" -/obj/screen/alert/direction_lock/Click() +/atom/movable/screen/alert/direction_lock/Click() if(isliving(usr)) var/mob/living/L = usr return L.clear_forced_look() //Constructs -/obj/screen/alert/holy_fire +/atom/movable/screen/alert/holy_fire name = "Holy Fire" desc = "Your body is crumbling from the holy energies. Get out." icon_state = "fire" //ALIENS -/obj/screen/alert/alien_tox +/atom/movable/screen/alert/alien_tox name = "Plasma" desc = "There's flammable plasma in the air. If it lights up, you'll be toast." icon_state = "alien_tox" alerttooltipstyle = "alien" -/obj/screen/alert/alien_fire +/atom/movable/screen/alert/alien_fire // This alert is temporarily gonna be thrown for all hot air but one day it will be used for literally being on fire name = "Too Hot" desc = "It's too hot! Flee to space or at least away from the flames. Standing on weeds will heal you." icon_state = "alien_fire" alerttooltipstyle = "alien" -/obj/screen/alert/alien_vulnerable +/atom/movable/screen/alert/alien_vulnerable name = "Severed Matriarchy" desc = "Your queen has been killed, you will suffer movement penalties and loss of hivemind. A new queen cannot be made until you recover." icon_state = "alien_noqueen" @@ -376,7 +376,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //BLOBS -/obj/screen/alert/nofactory +/atom/movable/screen/alert/nofactory name = "No Factory" desc = "You have no factory, and are slowly dying!" icon_state = "blobbernaut_nofactory" @@ -384,39 +384,39 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." //SILICONS -/obj/screen/alert/nocell +/atom/movable/screen/alert/nocell name = "Missing Power Cell" desc = "Unit has no power cell. No modules available until a power cell is reinstalled. Robotics may provide assistance." icon_state = "nocell" -/obj/screen/alert/emptycell +/atom/movable/screen/alert/emptycell name = "Out of Power" desc = "Unit's power cell has no charge remaining. No modules available until power cell is recharged. \ Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "emptycell" -/obj/screen/alert/lowcell +/atom/movable/screen/alert/lowcell name = "Low Charge" desc = "Unit's power cell is running low. Recharging stations are available in robotics, the dormitory bathrooms, and the AI satellite." icon_state = "lowcell" //Diona Nymph -/obj/screen/alert/nymph +/atom/movable/screen/alert/nymph name = "Gestalt merge" desc = "You have merged with a diona gestalt and are now part of it's biomass. You can still wiggle yourself free though." -/obj/screen/alert/nymph/Click() +/atom/movable/screen/alert/nymph/Click() if(!usr || !usr.client) return if(isnymph(usr)) var/mob/living/simple_animal/diona/D = usr return D.resist() -/obj/screen/alert/gestalt +/atom/movable/screen/alert/gestalt name = "Merged nymph" desc = "You have merged with one or more diona nymphs. Click here to drop it (or one of them)." -/obj/screen/alert/gestalt/Click() +/atom/movable/screen/alert/gestalt/Click() if(!usr || !usr.client) return @@ -433,25 +433,25 @@ Recharging stations are available in robotics, the dormitory bathrooms, and the D.split(TRUE) //Need to cover all use cases - emag, illegal upgrade module, malf AI hack, traitor cyborg -/obj/screen/alert/hacked +/atom/movable/screen/alert/hacked name = "Hacked" desc = "Hazardous non-standard equipment detected. Please ensure any usage of this equipment is in line with unit's laws, if any." icon_state = "hacked" -/obj/screen/alert/locked +/atom/movable/screen/alert/locked name = "Locked Down" desc = "Unit has been remotely locked down. Usage of a Robotics Control Console like the one in the Research Director's \ office by your AI master or any qualified human may resolve this matter. Robotics may provide further assistance if necessary." icon_state = "locked" -/obj/screen/alert/newlaw +/atom/movable/screen/alert/newlaw name = "Law Update" desc = "Laws have potentially been uploaded to or removed from this unit. Please be aware of any changes \ so as to remain in compliance with the most up-to-date laws." icon_state = "newlaw" timeout = 300 -/obj/screen/alert/hackingapc +/atom/movable/screen/alert/hackingapc name = "Hacking APC" desc = "An Area Power Controller is being hacked. When the process is \ complete, you will have exclusive control of it, and you will gain \ @@ -460,11 +460,11 @@ so as to remain in compliance with the most up-to-date laws." timeout = 600 var/atom/target = null -/obj/screen/alert/hackingapc/Destroy() +/atom/movable/screen/alert/hackingapc/Destroy() target = null return ..() -/obj/screen/alert/hackingapc/Click() +/atom/movable/screen/alert/hackingapc/Click() if(!usr || !usr.client) return if(!target) @@ -475,22 +475,22 @@ so as to remain in compliance with the most up-to-date laws." AI.eyeobj.setLoc(T) //MECHS -/obj/screen/alert/low_mech_integrity +/atom/movable/screen/alert/low_mech_integrity name = "Mech Damaged" desc = "Mech integrity is low." icon_state = "low_mech_integrity" -/obj/screen/alert/mech_port_available +/atom/movable/screen/alert/mech_port_available name = "Connect to Port" desc = "Click here to connect to an air port and refill your oxygen!" icon_state = "mech_port" var/obj/machinery/atmospherics/unary/portables_connector/target = null -/obj/screen/alert/mech_port_available/Destroy() +/atom/movable/screen/alert/mech_port_available/Destroy() target = null return ..() -/obj/screen/alert/mech_port_available/Click() +/atom/movable/screen/alert/mech_port_available/Click() if(!usr || !usr.client) return if(!ismecha(usr.loc) || !target) @@ -501,12 +501,12 @@ so as to remain in compliance with the most up-to-date laws." else to_chat(usr, "[M] failed to connect to the port.") -/obj/screen/alert/mech_port_disconnect +/atom/movable/screen/alert/mech_port_disconnect name = "Disconnect from Port" desc = "Click here to disconnect from your air port." icon_state = "mech_port_x" -/obj/screen/alert/mech_port_disconnect/Click() +/atom/movable/screen/alert/mech_port_disconnect/Click() if(!usr || !usr.client) return if(!ismecha(usr.loc)) @@ -517,40 +517,40 @@ so as to remain in compliance with the most up-to-date laws." else to_chat(usr, "[M] is not connected to a port at the moment.") -/obj/screen/alert/mech_nocell +/atom/movable/screen/alert/mech_nocell name = "Missing Power Cell" desc = "Mech has no power cell." icon_state = "nocell" -/obj/screen/alert/mech_emptycell +/atom/movable/screen/alert/mech_emptycell name = "Out of Power" desc = "Mech is out of power." icon_state = "emptycell" -/obj/screen/alert/mech_lowcell +/atom/movable/screen/alert/mech_lowcell name = "Low Charge" desc = "Mech is running out of power." icon_state = "lowcell" -/obj/screen/alert/mech_maintenance +/atom/movable/screen/alert/mech_maintenance name = "Maintenance Protocols" desc = "Maintenance protocols are currently in effect, most actions disabled." icon_state = "locked" //GUARDIANS -/obj/screen/alert/cancharge +/atom/movable/screen/alert/cancharge name = "Charge Ready" desc = "You are ready to charge at a location!" icon_state = "guardian_charge" alerttooltipstyle = "parasite" -/obj/screen/alert/canstealth +/atom/movable/screen/alert/canstealth name = "Stealth Ready" desc = "You are ready to enter stealth!" icon_state = "guardian_canstealth" alerttooltipstyle = "parasite" -/obj/screen/alert/instealth +/atom/movable/screen/alert/instealth name = "In Stealth" desc = "You are in stealth and your next attack will do bonus damage!" icon_state = "guardian_instealth" @@ -559,32 +559,32 @@ so as to remain in compliance with the most up-to-date laws." //GHOSTS //TODO: expand this system to replace the pollCandidates/CheckAntagonist/"choose quickly"/etc Yes/No messages -/obj/screen/alert/notify_cloning +/atom/movable/screen/alert/notify_cloning name = "Revival" desc = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!" icon_state = "template" timeout = 300 -/obj/screen/alert/notify_cloning/Click() +/atom/movable/screen/alert/notify_cloning/Click() if(!usr || !usr.client) return var/mob/dead/observer/G = usr G.reenter_corpse() -/obj/screen/alert/ghost +/atom/movable/screen/alert/ghost name = "Ghost" desc = "Would you like to ghost? You will be notified when your body is removed from the nest." icon_state = "template" timeout = 5 MINUTES // longer than any infection should be -/obj/screen/alert/ghost/Initialize(mapload) +/atom/movable/screen/alert/ghost/Initialize(mapload) . = ..() var/image/I = image('icons/mob/mob.dmi', icon_state = "ghost", layer = FLOAT_LAYER, dir = SOUTH) I.layer = FLOAT_LAYER I.plane = FLOAT_PLANE overlays += I -/obj/screen/alert/ghost/Click() +/atom/movable/screen/alert/ghost/Click() var/mob/living/carbon/human/infected_user = usr if(!istype(infected_user) || infected_user.stat == DEAD) infected_user.clear_alert("ghost_nest") @@ -595,7 +595,7 @@ so as to remain in compliance with the most up-to-date laws." return infected_user.ghostize(TRUE) -/obj/screen/alert/notify_action +/atom/movable/screen/alert/notify_action name = "Body created" desc = "A body was created. You can enter it." icon_state = "template" @@ -607,7 +607,7 @@ so as to remain in compliance with the most up-to-date laws." var/image/signed_up_overlay // image showing that you're signed up var/datum/candidate_poll/poll // If set, on Click() it'll register the player as a candidate -/obj/screen/alert/notify_action/process() +/atom/movable/screen/alert/notify_action/process() if(show_time_left) var/timeleft = timeout - world.time if(timeleft <= 0) @@ -632,14 +632,14 @@ so as to remain in compliance with the most up-to-date laws." qdel(O) ..() -/obj/screen/alert/notify_action/Destroy() +/atom/movable/screen/alert/notify_action/Destroy() target = null if(signed_up_overlay) overlays -= signed_up_overlay qdel(signed_up_overlay) return ..() -/obj/screen/alert/notify_action/Click() +/atom/movable/screen/alert/notify_action/Click() if(!usr || !usr.client) return var/mob/dead/observer/G = usr @@ -672,7 +672,7 @@ so as to remain in compliance with the most up-to-date laws." return G.ManualFollow(target) -/obj/screen/alert/notify_action/Topic(href, href_list) +/atom/movable/screen/alert/notify_action/Topic(href, href_list) if(!href_list["signup"]) return if(!poll) @@ -684,7 +684,7 @@ so as to remain in compliance with the most up-to-date laws." poll.sign_up(G) update_signed_up_alert(G) -/obj/screen/alert/notify_action/proc/update_signed_up_alert(mob/user) +/atom/movable/screen/alert/notify_action/proc/update_signed_up_alert(mob/user) if(!signed_up_overlay) signed_up_overlay = image('icons/mob/screen_gen.dmi', icon_state = "selector") signed_up_overlay.layer = FLOAT_LAYER @@ -694,7 +694,7 @@ so as to remain in compliance with the most up-to-date laws." else overlays -= signed_up_overlay -/obj/screen/alert/notify_action/proc/display_stacks(stacks = 1) +/atom/movable/screen/alert/notify_action/proc/display_stacks(stacks = 1) if(stacks <= 1) return @@ -712,7 +712,7 @@ so as to remain in compliance with the most up-to-date laws." qdel(O) -/obj/screen/alert/notify_soulstone +/atom/movable/screen/alert/notify_soulstone name = "Soul Stone" desc = "Someone is trying to capture your soul in a soul stone. Click to allow it." icon_state = "template" @@ -720,7 +720,7 @@ so as to remain in compliance with the most up-to-date laws." var/obj/item/soulstone/stone = null var/stoner = null -/obj/screen/alert/notify_soulstone/Click() +/atom/movable/screen/alert/notify_soulstone/Click() if(!usr || !usr.client) return if(stone) @@ -728,39 +728,39 @@ so as to remain in compliance with the most up-to-date laws." impossible for you to get back into the game as your regular character.", "Respawn", list("No", "Yes")) == "Yes") stone?.opt_in = TRUE -/obj/screen/alert/notify_soulstone/Destroy() +/atom/movable/screen/alert/notify_soulstone/Destroy() stone = null return ..() -/obj/screen/alert/notify_mapvote +/atom/movable/screen/alert/notify_mapvote name = "Map Vote" desc = "Vote on which map you would like to play on next!" icon_state = "map_vote" -/obj/screen/alert/notify_mapvote/Click() +/atom/movable/screen/alert/notify_mapvote/Click() usr.client.vote() //OBJECT-BASED -/obj/screen/alert/restrained/buckled +/atom/movable/screen/alert/restrained/buckled name = "Buckled" desc = "You've been buckled to something. Click the alert to unbuckle unless you're handcuffed." icon_state = "buckled" -/obj/screen/alert/restrained/handcuffed +/atom/movable/screen/alert/restrained/handcuffed name = "Handcuffed" desc = "You're handcuffed and can't act. If anyone drags you, you won't be able to move. Click the alert to free yourself." -/obj/screen/alert/restrained/legcuffed +/atom/movable/screen/alert/restrained/legcuffed name = "Legcuffed" desc = "You're legcuffed, which slows you down considerably. Click the alert to free yourself." -/obj/screen/alert/restrained/Click() +/atom/movable/screen/alert/restrained/Click() if(isliving(usr)) var/mob/living/L = usr return L.resist() -/obj/screen/alert/restrained/buckled/Click() +/atom/movable/screen/alert/restrained/buckled/Click() var/mob/living/L = usr if(!istype(L) || !L.can_resist()) return @@ -780,7 +780,7 @@ so as to remain in compliance with the most up-to-date laws." mymob.client.screen -= alerts[alerts[i]] return TRUE for(var/i in 1 to alerts.len) - var/obj/screen/alert/alert = alerts[alerts[i]] + var/atom/movable/screen/alert/alert = alerts[alerts[i]] if(alert.icon_state == "template") if(!icon_pref) icon_pref = ui_style2icon(mymob.client.prefs.UI_style) @@ -802,7 +802,7 @@ so as to remain in compliance with the most up-to-date laws." mymob.client.screen |= alert return TRUE -/obj/screen/alert/Click(location, control, params) +/atom/movable/screen/alert/Click(location, control, params) if(!usr || !usr.client) return var/paramslist = params2list(params) @@ -812,7 +812,7 @@ so as to remain in compliance with the most up-to-date laws." if(master) return usr.client.Click(master, location, control, params) -/obj/screen/alert/Destroy() +/atom/movable/screen/alert/Destroy() severity = 0 master = null screen_loc = "" diff --git a/code/_onclick/hud/alien_hud.dm b/code/_onclick/hud/alien_hud.dm index a541fca8b57d..c0e4a3ee0979 100644 --- a/code/_onclick/hud/alien_hud.dm +++ b/code/_onclick/hud/alien_hud.dm @@ -1,20 +1,20 @@ -/obj/screen/alien +/atom/movable/screen/alien icon = 'icons/mob/screen_alien.dmi' -/obj/screen/alien/leap +/atom/movable/screen/alien/leap name = "toggle leap" icon_state = "leap_off" -/obj/screen/alien/leap/Click() +/atom/movable/screen/alien/leap/Click() if(isalienadult(usr)) var/mob/living/carbon/alien/humanoid/hunter/AH = usr AH.toggle_leap() -/obj/screen/alien/nightvision +/atom/movable/screen/alien/nightvision name = "toggle night-vision" icon_state = "nightvision1" -/obj/screen/alien/nightvision/Click() +/atom/movable/screen/alien/nightvision/Click() var/mob/living/carbon/alien/humanoid/A = usr A.night_vision_toggle() @@ -32,7 +32,7 @@ update_sight() -/obj/screen/alien/plasma_display +/atom/movable/screen/alien/plasma_display icon = 'icons/mob/screen_gen.dmi' icon_state = "power_display2" name = "plasma stored" @@ -46,20 +46,20 @@ /datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner) ..() - var/obj/screen/using - var/obj/screen/inventory/inv_box + var/atom/movable/screen/using + var/atom/movable/screen/inventory/inv_box - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.screen_loc = ui_alien_language_menu static_inventory += using - using = new /obj/screen/act_intent/alien() + using = new /atom/movable/screen/act_intent/alien() using.icon_state = (mymob.a_intent == "hurt" ? INTENT_HARM : mymob.a_intent) using.screen_loc = ui_acti static_inventory += using action_intent = using - using = new /obj/screen/mov_intent() + using = new /atom/movable/screen/mov_intent() using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi @@ -67,13 +67,13 @@ move_intent = using if(isalienhunter(mymob)) - mymob.leap_icon = new /obj/screen/alien/leap() + mymob.leap_icon = new /atom/movable/screen/alien/leap() mymob.leap_icon.icon = 'icons/mob/screen_alien.dmi' mymob.leap_icon.screen_loc = ui_alien_storage_r static_inventory += mymob.leap_icon //equippable shit - inv_box = new /obj/screen/inventory/hand() + inv_box = new /atom/movable/screen/inventory/hand() inv_box.name = "r_hand" inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_r" @@ -81,7 +81,7 @@ inv_box.slot_id = SLOT_HUD_RIGHT_HAND static_inventory += inv_box - inv_box = new /obj/screen/inventory/hand() + inv_box = new /atom/movable/screen/inventory/hand() inv_box.name = "l_hand" inv_box.icon = 'icons/mob/screen_alien.dmi' inv_box.icon_state = "hand_l" @@ -89,14 +89,14 @@ inv_box.slot_id = SLOT_HUD_LEFT_HAND static_inventory += inv_box - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.name = "hand" using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "hand1" using.screen_loc = ui_swaphand1 static_inventory += using - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.name = "hand" using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "hand2" @@ -105,47 +105,47 @@ //end of equippable shit - using = new /obj/screen/resist() + using = new /atom/movable/screen/resist() using.name = "resist" using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "act_resist" using.screen_loc = ui_pull_resist static_inventory += using - using = new /obj/screen/drop() + using = new /atom/movable/screen/drop() using.name = "drop" using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = "act_drop" using.screen_loc = ui_drop_throw static_inventory += using - mymob.throw_icon = new /obj/screen/throw_catch() + mymob.throw_icon = new /atom/movable/screen/throw_catch() mymob.throw_icon.icon = 'icons/mob/screen_alien.dmi' mymob.throw_icon.screen_loc = ui_drop_throw static_inventory += mymob.throw_icon - mymob.healths = new /obj/screen/healths/alien() + mymob.healths = new /atom/movable/screen/healths/alien() infodisplay += mymob.healths - nightvisionicon = new /obj/screen/alien/nightvision() + nightvisionicon = new /atom/movable/screen/alien/nightvision() infodisplay += nightvisionicon - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_alien.dmi' mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) mymob.pullin.screen_loc = ui_pull_resist hotkeybuttons += mymob.pullin - alien_plasma_display = new /obj/screen/alien/plasma_display() + alien_plasma_display = new /atom/movable/screen/alien/plasma_display() infodisplay += alien_plasma_display - zone_select = new /obj/screen/zone_sel/alien() + zone_select = new /atom/movable/screen/zone_sel/alien() zone_select.hud = src zone_select.update_icon(UPDATE_OVERLAYS) static_inventory += zone_select - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src inv_slots[inv.slot_id] = inv diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm index f97e593d088e..e911c2bb3960 100644 --- a/code/_onclick/hud/alien_larva.dm +++ b/code/_onclick/hud/alien_larva.dm @@ -5,37 +5,37 @@ /datum/hud/larva/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/act_intent/alien() + using = new /atom/movable/screen/act_intent/alien() using.icon_state = mymob.a_intent static_inventory += using action_intent = using - using = new /obj/screen/mov_intent() + using = new /atom/movable/screen/mov_intent() using.icon = 'icons/mob/screen_alien.dmi' using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") static_inventory += using move_intent = using - mymob.healths = new /obj/screen/healths/alien() + mymob.healths = new /atom/movable/screen/healths/alien() infodisplay += mymob.healths - nightvisionicon = new /obj/screen/alien/nightvision() + nightvisionicon = new /atom/movable/screen/alien/nightvision() infodisplay += nightvisionicon - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_alien.dmi' mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) mymob.pullin.screen_loc = ui_pull_resist hotkeybuttons += mymob.pullin - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.screen_loc = ui_alienlarva_language_menu static_inventory += using - zone_select = new /obj/screen/zone_sel/alien() + zone_select = new /atom/movable/screen/zone_sel/alien() zone_select.hud = src zone_select.update_icon(UPDATE_OVERLAYS) static_inventory += zone_select diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm index 708978b64bcf..dfb74955d1b1 100644 --- a/code/_onclick/hud/blob_overmind.dm +++ b/code/_onclick/hud/blob_overmind.dm @@ -2,135 +2,135 @@ if(client && !hud_used) hud_used = new /datum/hud/blob_overmind(src) -/obj/screen/blob +/atom/movable/screen/blob icon = 'icons/mob/blob.dmi' -/obj/screen/blob/MouseEntered(location,control,params) +/atom/movable/screen/blob/MouseEntered(location, control, params) . = ..() openToolTip(usr,src,params,title = name,content = desc, theme = "blob") -/obj/screen/blob/MouseExited() +/atom/movable/screen/blob/MouseExited() closeToolTip(usr) return ..() -/obj/screen/blob/BlobHelp +/atom/movable/screen/blob/BlobHelp icon_state = "ui_help" name = "Blob Help" desc = "Help on playing blob!" -/obj/screen/blob/BlobHelp/Click() +/atom/movable/screen/blob/BlobHelp/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.blob_help() -/obj/screen/blob/JumpToNode +/atom/movable/screen/blob/JumpToNode icon_state = "ui_tonode" name = "Jump to Node" desc = "Moves your camera to a selected blob node." -/obj/screen/blob/JumpToNode/Click() +/atom/movable/screen/blob/JumpToNode/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.jump_to_node() -/obj/screen/blob/JumpToCore +/atom/movable/screen/blob/JumpToCore icon_state = "ui_tocore" name = "Jump to Core" desc = "Moves your camera to your blob core." -/obj/screen/blob/JumpToCore/MouseEntered(location,control,params) +/atom/movable/screen/blob/JumpToCore/MouseEntered(location, control, params) if(hud && hud.mymob && isovermind(hud.mymob)) name = initial(name) desc = initial(desc) return ..() -/obj/screen/blob/JumpToCore/Click() +/atom/movable/screen/blob/JumpToCore/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.transport_core() -/obj/screen/blob/Blobbernaut +/atom/movable/screen/blob/Blobbernaut icon_state = "ui_blobbernaut" name = "Produce Blobbernaut (60)" desc = "Produces a strong, intelligent blobbernaut from a factory blob for 60 resources.
The factory blob will be destroyed in the process." -/obj/screen/blob/Blobbernaut/Click() +/atom/movable/screen/blob/Blobbernaut/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_blobbernaut() -/obj/screen/blob/StorageBlob +/atom/movable/screen/blob/StorageBlob icon_state = "ui_storage" name = "Produce Storage Blob (40)" desc = "Produces a storage blob for 40 resources.
Storage blobs will raise your max resource cap by 50." -/obj/screen/blob/StorageBlob/Click() +/atom/movable/screen/blob/StorageBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_storage() -/obj/screen/blob/ResourceBlob +/atom/movable/screen/blob/ResourceBlob icon_state = "ui_resource" name = "Produce Resource Blob (40)" desc = "Produces a resource blob for 40 resources.
Resource blobs will give you resources every few seconds." -/obj/screen/blob/ResourceBlob/Click() +/atom/movable/screen/blob/ResourceBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_resource() -/obj/screen/blob/NodeBlob +/atom/movable/screen/blob/NodeBlob icon_state = "ui_node" name = "Produce Node Blob (60)" desc = "Produces a node blob for 60 resources.
Node blobs will expand and activate nearby resource and factory blobs." -/obj/screen/blob/NodeBlob/Click() +/atom/movable/screen/blob/NodeBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_node() -/obj/screen/blob/FactoryBlob +/atom/movable/screen/blob/FactoryBlob icon_state = "ui_factory" name = "Produce Factory Blob (60)" desc = "Produces a factory blob for 60 resources.
Factory blobs will produce spores every few seconds." -/obj/screen/blob/FactoryBlob/Click() +/atom/movable/screen/blob/FactoryBlob/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.create_factory() -/obj/screen/blob/ReadaptChemical +/atom/movable/screen/blob/ReadaptChemical icon_state = "ui_chemswap" name = "Readapt Chemical (50)" desc = "Randomly rerolls your chemical for 50 resources." -/obj/screen/blob/ReadaptChemical/MouseEntered(location,control,params) +/atom/movable/screen/blob/ReadaptChemical/MouseEntered(location, control, params) if(hud && hud.mymob && isovermind(hud.mymob)) name = initial(name) desc = initial(desc) return ..() -/obj/screen/blob/ReadaptChemical/Click() +/atom/movable/screen/blob/ReadaptChemical/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.chemical_reroll() -/obj/screen/blob/RelocateCore +/atom/movable/screen/blob/RelocateCore icon_state = "ui_swap" name = "Relocate Core (80)" desc = "Swaps a node and your core for 80 resources." -/obj/screen/blob/RelocateCore/Click() +/atom/movable/screen/blob/RelocateCore/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.relocate_core() -/obj/screen/blob/Split +/atom/movable/screen/blob/Split icon_state = "ui_split" name = "Split consciousness (100)" desc = "Creates another Blob Overmind at the targeted node. One use only.
Offspring are unable to use this ability." -/obj/screen/blob/Split/Click() +/atom/movable/screen/blob/Split/Click() if(isovermind(usr)) var/mob/camera/blob/B = usr B.split_consciousness() @@ -139,9 +139,9 @@ /datum/hud/blob_overmind/New(mob/user) ..() - var/obj/screen/using + var/atom/movable/screen/using - blobpwrdisplay = new /obj/screen() + blobpwrdisplay = new /atom/movable/screen() blobpwrdisplay.name = "blob power" blobpwrdisplay.icon_state = "block" blobpwrdisplay.screen_loc = ui_health @@ -150,56 +150,56 @@ blobpwrdisplay.plane = ABOVE_HUD_PLANE static_inventory += blobpwrdisplay - blobhealthdisplay = new /obj/screen() + blobhealthdisplay = new /atom/movable/screen() blobhealthdisplay.name = "blob health" blobhealthdisplay.icon_state = "block" blobhealthdisplay.screen_loc = ui_internal static_inventory += blobhealthdisplay - using = new /obj/screen/blob/BlobHelp() + using = new /atom/movable/screen/blob/BlobHelp() using.screen_loc = "WEST:6,NORTH:-3" static_inventory += using - using = new /obj/screen/blob/JumpToNode() + using = new /atom/movable/screen/blob/JumpToNode() using.screen_loc = ui_inventory static_inventory += using - using = new /obj/screen/blob/JumpToCore() + using = new /atom/movable/screen/blob/JumpToCore() using.screen_loc = ui_zonesel using.hud = src static_inventory += using - using = new /obj/screen/blob/Blobbernaut() + using = new /atom/movable/screen/blob/Blobbernaut() using.screen_loc = ui_id static_inventory += using - using = new /obj/screen/blob/StorageBlob() + using = new /atom/movable/screen/blob/StorageBlob() using.screen_loc = ui_belt static_inventory += using - using = new /obj/screen/blob/ResourceBlob() + using = new /atom/movable/screen/blob/ResourceBlob() using.screen_loc = ui_back static_inventory += using - using = new /obj/screen/blob/NodeBlob() + using = new /atom/movable/screen/blob/NodeBlob() using.screen_loc = using.screen_loc = ui_rhand static_inventory += using - using = new /obj/screen/blob/FactoryBlob() + using = new /atom/movable/screen/blob/FactoryBlob() using.screen_loc = using.screen_loc = ui_lhand static_inventory += using - using = new /obj/screen/blob/ReadaptChemical() + using = new /atom/movable/screen/blob/ReadaptChemical() using.screen_loc = ui_storage1 using.hud = src static_inventory += using - using = new /obj/screen/blob/RelocateCore() + using = new /atom/movable/screen/blob/RelocateCore() using.screen_loc = ui_storage2 static_inventory += using var/mob/camera/blob/B = user if(!B.is_offspring) // Checks if the blob is an offspring, to not create split button if it is - using = new /obj/screen/blob/Split() + using = new /atom/movable/screen/blob/Split() using.screen_loc = ui_acti static_inventory += using diff --git a/code/_onclick/hud/bot_hud.dm b/code/_onclick/hud/bot_hud.dm index 7370454bf962..9a27937a5be6 100644 --- a/code/_onclick/hud/bot_hud.dm +++ b/code/_onclick/hud/bot_hud.dm @@ -1,12 +1,12 @@ -/obj/screen/bot +/atom/movable/screen/bot icon = 'icons/mob/screen_bot.dmi' -/obj/screen/bot/radio +/atom/movable/screen/bot/radio name = "radio" icon_state = "radio" screen_loc = ui_bot_radio -/obj/screen/bot/radio/Click() +/atom/movable/screen/bot/radio/Click() if(isbot(usr)) var/mob/living/simple_animal/bot/B = usr B.Radio.interact(usr) @@ -17,16 +17,16 @@ /datum/hud/bot/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/bot/radio() + using = new /atom/movable/screen/bot/radio() static_inventory += using - mymob.healths = new /obj/screen/healths/bot() + mymob.healths = new /atom/movable/screen/healths/bot() mymob.healths.screen_loc = ui_borg_health infodisplay += mymob.healths - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_bot.dmi' mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) diff --git a/code/_onclick/hud/constructs_hud.dm b/code/_onclick/hud/constructs_hud.dm index 0c3f9eaf8a44..e2dea6424071 100644 --- a/code/_onclick/hud/constructs_hud.dm +++ b/code/_onclick/hud/constructs_hud.dm @@ -8,7 +8,7 @@ /datum/hud/construct/armoured/New(mob/owner) ..() - mymob.healths = new /obj/screen() + mymob.healths = new /atom/movable/screen() mymob.healths.icon = 'icons/mob/screen_construct.dmi' mymob.healths.icon_state = "juggernaut_health0" mymob.healths.name = "health" @@ -21,7 +21,7 @@ /datum/hud/construct/builder/New(mob/owner) ..() - mymob.healths = new /obj/screen() + mymob.healths = new /atom/movable/screen() mymob.healths.icon = 'icons/mob/screen_construct.dmi' mymob.healths.icon_state = "artificer_health0" mymob.healths.name = "health" @@ -34,7 +34,7 @@ /datum/hud/construct/wraith/New(mob/owner) ..() - mymob.healths = new /obj/screen() + mymob.healths = new /atom/movable/screen() mymob.healths.icon = 'icons/mob/screen_construct.dmi' mymob.healths.icon_state = "wraith_health0" mymob.healths.name = "health" @@ -47,7 +47,7 @@ /datum/hud/construct/harvester/New(mob/owner) ..() - mymob.healths = new /obj/screen() + mymob.healths = new /atom/movable/screen() mymob.healths.icon = 'icons/mob/screen_construct.dmi' mymob.healths.icon_state = "harvester_health0" mymob.healths.name = "health" @@ -56,13 +56,13 @@ /datum/hud/construct/New(mob/owner) ..() - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_construct.dmi' mymob.pullin.icon_state = "pull0" mymob.pullin.name = "pull" mymob.pullin.screen_loc = ui_construct_pull - var/obj/screen/using - using = new /obj/screen/act_intent/simple_animal() + var/atom/movable/screen/using + using = new /atom/movable/screen/act_intent/simple_animal() using.icon_state = mymob.a_intent static_inventory += using action_intent = using diff --git a/code/_onclick/hud/follow_alert.dm b/code/_onclick/hud/follow_alert.dm index d8f95d069864..b3d0f10c4ad4 100644 --- a/code/_onclick/hud/follow_alert.dm +++ b/code/_onclick/hud/follow_alert.dm @@ -1,4 +1,4 @@ -/obj/screen/alert/augury +/atom/movable/screen/alert/augury name = "Something interesting!" desc = "Click to follow." /// The atom being followed @@ -19,7 +19,7 @@ * * follow_target: The atom to start out following. Can be null, in which case change_targets() should be used at some point. * * alert_overlay_override: If follow_target is provided (or not), use this for the alert image. */ -/obj/screen/alert/augury/Initialize(mapload, atom/movable/follow_target, image/alert_overlay_override) +/atom/movable/screen/alert/augury/Initialize(mapload, atom/movable/follow_target, image/alert_overlay_override) . = ..() src.follow_target = follow_target @@ -37,7 +37,7 @@ alert_overlay_override.plane = FLOAT_PLANE overlays += alert_overlay_override -/obj/screen/alert/augury/Click(location, control, params) +/atom/movable/screen/alert/augury/Click(location, control, params) . = ..() if(!usr || !usr.client || !isobserver(usr)) return @@ -48,7 +48,7 @@ to_chat(usr, "You are now auto-following [thing_followed]. Click again to stop.") add_follower(usr) -/obj/screen/alert/augury/Destroy(force) +/atom/movable/screen/alert/augury/Destroy(force) for(var/atom/movable/follower in followers) // in case something was nulled follower.stop_orbit() @@ -68,7 +68,7 @@ /// Executed when the parent is deleted. /// Don't immediately kill ourselves, since it's possible that we might want to move somewhere else /// (for example, after a meteor strike) -/obj/screen/alert/augury/proc/on_following_qdel(atom/movable/A) +/atom/movable/screen/alert/augury/proc/on_following_qdel(atom/movable/A) SIGNAL_HANDLER // COMSIG_PARENT_QDELETING for(var/atom/movable/follower in followers) follower.stop_orbit() @@ -86,7 +86,7 @@ * Arguments: * * next_to - The next atom to follow. */ -/obj/screen/alert/augury/proc/change_targets(atom/movable/next_to) +/atom/movable/screen/alert/augury/proc/change_targets(atom/movable/next_to) // unregister first so we aren't bombarded when changing orbits if(isnull(next_to)) return @@ -100,15 +100,15 @@ RegisterSignal(follow_target, COMSIG_ATOM_ORBIT_STOP, PROC_REF(remove_follower_on_stop_orbit)) -/obj/screen/alert/augury/proc/add_follower(atom/movable/follower) +/atom/movable/screen/alert/augury/proc/add_follower(atom/movable/follower) followers |= follower follower.orbit(follow_target) -/obj/screen/alert/augury/proc/remove_follower(atom/movable/follower) +/atom/movable/screen/alert/augury/proc/remove_follower(atom/movable/follower) followers -= follower follower.stop_orbit() -/obj/screen/alert/augury/proc/get_next_target() +/atom/movable/screen/alert/augury/proc/get_next_target() if(!length(next_targets)) return @@ -121,27 +121,27 @@ return target /// Called when someone stops orbiting our followed object, so they can actually get out of the loop. -/obj/screen/alert/augury/proc/remove_follower_on_stop_orbit(atom/movable/followed, atom/movable/follower) +/atom/movable/screen/alert/augury/proc/remove_follower_on_stop_orbit(atom/movable/followed, atom/movable/follower) SIGNAL_HANDLER // COMSIG_ATOM_ORBIT_STOP if(locateUID(follower.orbiting_uid) != follow_target) remove_follower(follower) // don't try to stop the orbit again /// Meteor alert. /// Appears during a meteor storm and allows for auto-following of debris. -/obj/screen/alert/augury/meteor +/atom/movable/screen/alert/augury/meteor name = "Meteors incoming!" desc = "Click to automatically follow debris, and click again to stop." -/obj/screen/alert/augury/meteor/Initialize(mapload) +/atom/movable/screen/alert/augury/meteor/Initialize(mapload) var/image/meteor_img = image(icon = 'icons/obj/meteor.dmi', icon_state = "flaming") . = ..(mapload, alert_overlay_override = meteor_img) START_PROCESSING(SSfastprocess, src) -/obj/screen/alert/augury/meteor/Destroy(force) +/atom/movable/screen/alert/augury/meteor/Destroy(force) . = ..() STOP_PROCESSING(SSfastprocess, src) -/obj/screen/alert/augury/meteor/process() +/atom/movable/screen/alert/augury/meteor/process() var/overridden = FALSE for(var/obj/effect/meteor/M in GLOB.meteor_list) if(!is_station_level(M.z)) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index ec6bde573d6b..e93a0a206bd2 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -1,5 +1,5 @@ /mob/proc/overlay_fullscreen(category, type, severity) - var/obj/screen/fullscreen/screen = screens[category] + var/atom/movable/screen/fullscreen/screen = screens[category] if(!screen || screen.type != type) // needs to be recreated clear_fullscreen(category, FALSE) @@ -17,7 +17,7 @@ return screen /mob/proc/clear_fullscreen(category, animated = 10) - var/obj/screen/fullscreen/screen = screens[category] + var/atom/movable/screen/fullscreen/screen = screens[category] if(!screen) return @@ -41,7 +41,7 @@ /datum/hud/proc/reload_fullscreen() if(mymob.client) - var/obj/screen/fullscreen/screen + var/atom/movable/screen/fullscreen/screen var/list/screens = mymob.screens for(var/category in screens) screen = screens[category] @@ -51,7 +51,7 @@ else mymob.client.screen -= screen -/obj/screen/fullscreen +/atom/movable/screen/fullscreen icon = 'icons/mob/screen_full.dmi' icon_state = "default" screen_loc = "CENTER-7,CENTER-7" @@ -62,66 +62,66 @@ var/severity = 0 var/show_when_dead = FALSE -/obj/screen/fullscreen/proc/update_for_view(client_view) +/atom/movable/screen/fullscreen/proc/update_for_view(client_view) if(screen_loc == "CENTER-7,CENTER-7" && view != client_view) var/list/actualview = getviewsize(client_view) view = client_view transform = matrix(actualview[1]/FULLSCREEN_OVERLAY_RESOLUTION_X, 0, 0, 0, actualview[2]/FULLSCREEN_OVERLAY_RESOLUTION_Y, 0) -/obj/screen/fullscreen/proc/should_show_to(mob/mymob) +/atom/movable/screen/fullscreen/proc/should_show_to(mob/mymob) if(!show_when_dead && mymob.stat == DEAD) return FALSE return TRUE -/obj/screen/fullscreen/Destroy() +/atom/movable/screen/fullscreen/Destroy() severity = 0 return ..() -/obj/screen/fullscreen/brute +/atom/movable/screen/fullscreen/brute icon_state = "brutedamageoverlay" layer = UI_DAMAGE_LAYER -/obj/screen/fullscreen/oxy +/atom/movable/screen/fullscreen/oxy icon_state = "oxydamageoverlay" layer = UI_DAMAGE_LAYER -/obj/screen/fullscreen/crit +/atom/movable/screen/fullscreen/crit icon_state = "passage" layer = CRIT_LAYER -/obj/screen/fullscreen/blind +/atom/movable/screen/fullscreen/blind icon_state = "blackimageoverlay" layer = BLIND_LAYER -/obj/screen/fullscreen/impaired +/atom/movable/screen/fullscreen/impaired icon_state = "impairedoverlay" -/obj/screen/fullscreen/payback +/atom/movable/screen/fullscreen/payback icon = 'icons/mob/screen_payback.dmi' icon_state = "payback" show_when_dead = TRUE -/obj/screen/fullscreen/fog +/atom/movable/screen/fullscreen/fog icon = 'icons/mob/screen_fog.dmi' icon_state = "fog" color = "#FF0000" -/obj/screen/fullscreen/flash +/atom/movable/screen/fullscreen/flash icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" -/obj/screen/fullscreen/flash/noise +/atom/movable/screen/fullscreen/flash/noise icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "noise" -/obj/screen/fullscreen/high +/atom/movable/screen/fullscreen/high icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "druggy" -/obj/screen/fullscreen/lighting_backdrop +/atom/movable/screen/fullscreen/lighting_backdrop icon = 'icons/mob/screen_gen.dmi' icon_state = "flash" transform = matrix(200, 0, 0, 0, 200, 0) @@ -130,18 +130,18 @@ show_when_dead = TRUE //Provides darkness to the back of the lighting plane -/obj/screen/fullscreen/lighting_backdrop/lit +/atom/movable/screen/fullscreen/lighting_backdrop/lit invisibility = INVISIBILITY_LIGHTING layer = BACKGROUND_LAYER+21 color = "#000" show_when_dead = TRUE //Provides whiteness in case you don't see lights so everything is still visible -/obj/screen/fullscreen/lighting_backdrop/unlit +/atom/movable/screen/fullscreen/lighting_backdrop/unlit layer = BACKGROUND_LAYER+20 show_when_dead = TRUE -/obj/screen/fullscreen/see_through_darkness +/atom/movable/screen/fullscreen/see_through_darkness icon_state = "nightvision" plane = LIGHTING_PLANE layer = LIGHTING_LAYER @@ -149,7 +149,7 @@ show_when_dead = TRUE /// An effect which tracks the cursor's location on the screen -/obj/screen/fullscreen/cursor_catcher +/atom/movable/screen/fullscreen/cursor_catcher icon_state = "fullscreen_blocker" // Fullscreen semi transparent icon plane = HUD_PLANE mouse_opacity = MOUSE_OPACITY_ICON @@ -167,14 +167,14 @@ var/mouse_params /// Links this up with a mob -/obj/screen/fullscreen/cursor_catcher/proc/assign_to_mob(mob/owner) +/atom/movable/screen/fullscreen/cursor_catcher/proc/assign_to_mob(mob/owner) src.owner = owner view_list = getviewsize(owner.client.view) RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) calculate_params() /// Update when the mob we're assigned to has moved -/obj/screen/fullscreen/cursor_catcher/proc/on_move(atom/source, atom/oldloc, dir, forced) +/atom/movable/screen/fullscreen/cursor_catcher/proc/on_move(atom/source, atom/oldloc, dir, forced) SIGNAL_HANDLER if(!given_turf) @@ -184,18 +184,18 @@ given_turf = locate(given_turf.x + x_offset, given_turf.y + y_offset, given_turf.z) -/obj/screen/fullscreen/cursor_catcher/MouseEntered(location, control, params) +/atom/movable/screen/fullscreen/cursor_catcher/MouseEntered(location, control, params) . = ..() MouseMove(location, control, params) if(usr == owner) calculate_params() -/obj/screen/fullscreen/cursor_catcher/MouseMove(location, control, params) +/atom/movable/screen/fullscreen/cursor_catcher/MouseMove(location, control, params) if(usr != owner) return mouse_params = params -/obj/screen/fullscreen/cursor_catcher/proc/calculate_params() +/atom/movable/screen/fullscreen/cursor_catcher/proc/calculate_params() var/list/modifiers = params2list(mouse_params) var/icon_x = text2num(LAZYACCESS(modifiers, "vis-x")) if(isnull(icon_x)) diff --git a/code/_onclick/hud/ghost_hud.dm b/code/_onclick/hud/ghost_hud.dm index ac71b9bf51c6..1ea78ca13718 100644 --- a/code/_onclick/hud/ghost_hud.dm +++ b/code/_onclick/hud/ghost_hud.dm @@ -3,47 +3,47 @@ hud_used = new /datum/hud/ghost(src) SEND_SIGNAL(src, COMSIG_MOB_HUD_CREATED) -/obj/screen/ghost +/atom/movable/screen/ghost icon = 'icons/mob/screen_ghost.dmi' -/obj/screen/ghost/MouseEntered() +/atom/movable/screen/ghost/MouseEntered() . = ..() flick(icon_state + "_anim", src) -/obj/screen/ghost/orbit +/atom/movable/screen/ghost/orbit name = "Orbit" icon_state = "orbit" -/obj/screen/ghost/orbit/Click() +/atom/movable/screen/ghost/orbit/Click() var/mob/dead/observer/G = usr G.follow() -/obj/screen/ghost/reenter_corpse +/atom/movable/screen/ghost/reenter_corpse name = "Re-enter corpse" icon_state = "reenter_corpse" -/obj/screen/ghost/reenter_corpse/Click() +/atom/movable/screen/ghost/reenter_corpse/Click() var/mob/dead/observer/G = usr G.reenter_corpse() -/obj/screen/ghost/teleport +/atom/movable/screen/ghost/teleport name = "Teleport" icon_state = "teleport" -/obj/screen/ghost/teleport/Click() +/atom/movable/screen/ghost/teleport/Click() var/mob/dead/observer/G = usr G.dead_tele() -/obj/screen/ghost/respawn_list +/atom/movable/screen/ghost/respawn_list name = "Ghost spawns" icon = 'icons/mob/screen_midnight.dmi' icon_state = "template" -/obj/screen/ghost/respawn_list/Initialize(mapload) +/atom/movable/screen/ghost/respawn_list/Initialize(mapload) . = ..() update_hidden_state() -/obj/screen/ghost/respawn_list/Click() +/atom/movable/screen/ghost/respawn_list/Click() var/client/C = hud.mymob.client hud.inventory_shown = !hud.inventory_shown if(hud.inventory_shown) @@ -52,7 +52,7 @@ C.screen -= hud.toggleable_inventory update_hidden_state() -/obj/screen/ghost/respawn_list/proc/update_hidden_state() +/atom/movable/screen/ghost/respawn_list/proc/update_hidden_state() var/matrix/M = matrix(transform) M.Turn(-90) @@ -61,19 +61,19 @@ img.transform = M overlays += img -/obj/screen/ghost/respawn_mob +/atom/movable/screen/ghost/respawn_mob name = "Mob spawners" icon_state = "mob_spawner" -/obj/screen/ghost/respawn_mob/Click() +/atom/movable/screen/ghost/respawn_mob/Click() var/mob/dead/observer/G = usr G.open_spawners_menu() -/obj/screen/ghost/respawn_pai +/atom/movable/screen/ghost/respawn_pai name = "Configure pAI" icon_state = "pai" -/obj/screen/ghost/respawn_pai/Click() +/atom/movable/screen/ghost/respawn_pai/Click() var/mob/dead/observer/G = usr if(!GLOB.paiController.check_recruit(G)) to_chat(G, "You are not eligible to become a pAI.") @@ -85,34 +85,34 @@ /datum/hud/ghost/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - using = new /obj/screen/ghost/orbit() + using = new /atom/movable/screen/ghost/orbit() using.screen_loc = ui_ghost_orbit static_inventory += using - using = new /obj/screen/ghost/reenter_corpse() + using = new /atom/movable/screen/ghost/reenter_corpse() using.screen_loc = ui_ghost_reenter_corpse static_inventory += using - using = new /obj/screen/ghost/teleport() + using = new /atom/movable/screen/ghost/teleport() using.screen_loc = ui_ghost_teleport static_inventory += using static_inventory += using - using = new /obj/screen/ghost/respawn_list() + using = new /atom/movable/screen/ghost/respawn_list() using.screen_loc = ui_ghost_respawn_list static_inventory += using - using = new /obj/screen/ghost/respawn_mob() + using = new /atom/movable/screen/ghost/respawn_mob() using.screen_loc = ui_ghost_respawn_mob toggleable_inventory += using - using = new /obj/screen/ghost/respawn_pai() + using = new /atom/movable/screen/ghost/respawn_pai() using.screen_loc = ui_ghost_respawn_pai toggleable_inventory += using - for(var/obj/screen/S in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/S in (static_inventory + toggleable_inventory)) S.hud = src /datum/hud/ghost/show_hud() diff --git a/code/_onclick/hud/guardian_hud.dm b/code/_onclick/hud/guardian_hud.dm index d00662f0c76d..122b2408c5e5 100644 --- a/code/_onclick/hud/guardian_hud.dm +++ b/code/_onclick/hud/guardian_hud.dm @@ -4,49 +4,49 @@ /datum/hud/guardian/New(mob/owner) ..() - var/obj/screen/using + var/atom/movable/screen/using - guardianhealthdisplay = new /obj/screen/healths/guardian() + guardianhealthdisplay = new /atom/movable/screen/healths/guardian() infodisplay += guardianhealthdisplay - using = new /obj/screen/act_intent/guardian() + using = new /atom/movable/screen/act_intent/guardian() using.icon_state = mymob.a_intent static_inventory += using action_intent = using - using = new /obj/screen/guardian/Manifest() + using = new /atom/movable/screen/guardian/Manifest() using.screen_loc = ui_rhand static_inventory += using - using = new /obj/screen/guardian/Recall() + using = new /atom/movable/screen/guardian/Recall() using.screen_loc = ui_lhand static_inventory += using - using = new /obj/screen/guardian/ToggleMode() + using = new /atom/movable/screen/guardian/ToggleMode() using.screen_loc = ui_storage1 static_inventory += using - using = new /obj/screen/guardian/ToggleLight() + using = new /atom/movable/screen/guardian/ToggleLight() using.screen_loc = ui_inventory static_inventory += using - using = new /obj/screen/guardian/Communicate() + using = new /atom/movable/screen/guardian/Communicate() using.screen_loc = ui_back static_inventory += using //HUD BUTTONS -/obj/screen/guardian +/atom/movable/screen/guardian icon = 'icons/mob/guardian.dmi' icon_state = "base" -/obj/screen/guardian/Manifest +/atom/movable/screen/guardian/Manifest icon_state = "manifest" name = "Manifest" desc = "Spring forth into battle!" -/obj/screen/guardian/Manifest/Click() +/atom/movable/screen/guardian/Manifest/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr var/summoner_loc = G.summoner.loc @@ -59,43 +59,43 @@ if(G.loc == G.summoner) G.Manifest() -/obj/screen/guardian/Recall +/atom/movable/screen/guardian/Recall icon_state = "recall" name = "Recall" desc = "Return to your user." -/obj/screen/guardian/Recall/Click() +/atom/movable/screen/guardian/Recall/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Recall() -/obj/screen/guardian/ToggleMode +/atom/movable/screen/guardian/ToggleMode icon_state = "toggle" name = "Toggle Mode" desc = "Switch between ability modes." -/obj/screen/guardian/ToggleMode/Click() +/atom/movable/screen/guardian/ToggleMode/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleMode() -/obj/screen/guardian/Communicate +/atom/movable/screen/guardian/Communicate icon_state = "communicate" name = "Communicate" desc = "Communicate telepathically with your user." -/obj/screen/guardian/Communicate/Click() +/atom/movable/screen/guardian/Communicate/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.Communicate() -/obj/screen/guardian/ToggleLight +/atom/movable/screen/guardian/ToggleLight icon_state = "light" name = "Toggle Light" desc = "Glow like star dust." -/obj/screen/guardian/ToggleLight/Click() +/atom/movable/screen/guardian/ToggleLight/Click() if(isguardian(usr)) var/mob/living/simple_animal/hostile/guardian/G = usr G.ToggleLight() diff --git a/code/_onclick/hud/hud_datum.dm b/code/_onclick/hud/hud_datum.dm index 4d65d41e8cc2..6cfe661d3acf 100644 --- a/code/_onclick/hud/hud_datum.dm +++ b/code/_onclick/hud/hud_datum.dm @@ -12,36 +12,36 @@ var/inventory_shown = TRUE //the inventory var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) - var/obj/screen/lingchemdisplay - var/obj/screen/lingstingdisplay - - var/obj/screen/guardianhealthdisplay - - var/obj/screen/blobpwrdisplay - var/obj/screen/blobhealthdisplay - var/obj/screen/vampire_blood_display - var/obj/screen/alien_plasma_display - var/obj/screen/nightvisionicon - var/obj/screen/action_intent - var/obj/screen/zone_select - var/obj/screen/move_intent - var/obj/screen/module_store_icon - var/obj/screen/combo/combo_display + var/atom/movable/screen/lingchemdisplay + var/atom/movable/screen/lingstingdisplay + + var/atom/movable/screen/guardianhealthdisplay + + var/atom/movable/screen/blobpwrdisplay + var/atom/movable/screen/blobhealthdisplay + var/atom/movable/screen/vampire_blood_display + var/atom/movable/screen/alien_plasma_display + var/atom/movable/screen/nightvisionicon + var/atom/movable/screen/action_intent + var/atom/movable/screen/zone_select + var/atom/movable/screen/move_intent + var/atom/movable/screen/module_store_icon + var/atom/movable/screen/combo/combo_display var/list/static_inventory = list() //the screen objects which are static var/list/toggleable_inventory = list() //the screen objects which can be hidden var/list/hotkeybuttons = list() //the buttons that can be used via hotkeys var/list/infodisplay = list() //the screen objects that display mob info (health, alien plasma, etc...) - var/list/inv_slots[SLOT_HUD_AMOUNT] // /obj/screen/inventory objects, ordered by their slot ID. + var/list/inv_slots[SLOT_HUD_AMOUNT] // /atom/movable/screen/inventory objects, ordered by their slot ID. - var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle + var/atom/movable/screen/movable/action_button/hide_toggle/hide_actions_toggle var/action_buttons_hidden = FALSE - var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object + var/list/atom/movable/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object ///Assoc list of controller groups, associated with key string group name with value of the plane master controller ref var/list/atom/movable/plane_master_controller/plane_master_controllers = list() ///UI for screentips that appear when you mouse over things - var/obj/screen/screentip/screentip_text + var/atom/movable/screen/screentip/screentip_text /mob/proc/create_mob_hud() if(client && !hud_used) @@ -53,8 +53,8 @@ hide_actions_toggle = new hide_actions_toggle.InitialiseIcon(mymob) - for(var/mytype in subtypesof(/obj/screen/plane_master)) - var/obj/screen/plane_master/instance = new mytype() + for(var/mytype in subtypesof(/atom/movable/screen/plane_master)) + var/atom/movable/screen/plane_master/instance = new mytype() plane_masters["[instance.plane]"] = instance instance.backdrop(mymob) @@ -181,7 +181,7 @@ /datum/hud/proc/plane_masters_update() // Plane masters are always shown to OUR mob, never to observers for(var/thing in plane_masters) - var/obj/screen/plane_master/PM = plane_masters[thing] + var/atom/movable/screen/plane_master/PM = plane_masters[thing] PM.backdrop(mymob) mymob.client.screen += PM diff --git a/code/_onclick/hud/human_hud.dm b/code/_onclick/hud/human_hud.dm index 1db2fe7cd1c3..67c9e2e66215 100644 --- a/code/_onclick/hud/human_hud.dm +++ b/code/_onclick/hud/human_hud.dm @@ -1,11 +1,11 @@ -/obj/screen/human +/atom/movable/screen/human icon = 'icons/mob/screen_midnight.dmi' -/obj/screen/human/toggle +/atom/movable/screen/human/toggle name = "toggle" icon_state = "toggle" -/obj/screen/human/toggle/Click() +/atom/movable/screen/human/toggle/Click() if(usr.hud_used.inventory_shown) usr.hud_used.inventory_shown = FALSE usr.client.screen -= usr.hud_used.toggleable_inventory @@ -15,28 +15,28 @@ usr.hud_used.hidden_inventory_update() -/obj/screen/human/equip +/atom/movable/screen/human/equip name = "equip" icon_state = "act_equip" -/obj/screen/human/equip/Click() +/atom/movable/screen/human/equip/Click() if(ismecha(usr.loc)) // stops inventory actions in a mech return 1 var/mob/living/carbon/human/H = usr H.quick_equip() -/obj/screen/ling +/atom/movable/screen/ling invisibility = INVISIBILITY_ABSTRACT -/obj/screen/ling/sting +/atom/movable/screen/ling/sting name = "current sting" screen_loc = ui_lingstingdisplay -/obj/screen/ling/sting/Click() +/atom/movable/screen/ling/sting/Click() var/datum/antagonist/changeling/cling = usr.mind.has_antag_datum(/datum/antagonist/changeling) cling?.chosen_sting?.unset_sting() -/obj/screen/ling/chems +/atom/movable/screen/ling/chems name = "chemical storage" icon_state = "power_display" screen_loc = ui_lingchemdisplay @@ -58,32 +58,32 @@ /datum/hud/human/New(mob/living/carbon/human/owner, ui_style = 'icons/mob/screen_white.dmi', ui_color = "#ffffff", ui_alpha = 255) ..() - owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness) + owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness) - var/obj/screen/using - var/obj/screen/inventory/inv_box + var/atom/movable/screen/using + var/atom/movable/screen/inventory/inv_box hud_alpha = ui_alpha - using = new /obj/screen/craft + using = new /atom/movable/screen/craft using.icon = ui_style using.color = ui_color using.alpha = ui_alpha static_inventory += using - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.icon = ui_style using.color = ui_color using.alpha = ui_alpha static_inventory += using - using = new /obj/screen/act_intent() + using = new /atom/movable/screen/act_intent() using.icon_state = mymob.a_intent using.alpha = ui_alpha static_inventory += using action_intent = using - using = new /obj/screen/mov_intent() + using = new /atom/movable/screen/mov_intent() using.icon = ui_style using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") using.screen_loc = ui_movi @@ -92,14 +92,14 @@ static_inventory += using move_intent = using - using = new /obj/screen/drop() + using = new /atom/movable/screen/drop() using.icon = ui_style using.screen_loc = ui_drop_throw using.color = ui_color using.alpha = ui_alpha static_inventory += using - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "i_clothing" inv_box.icon = ui_style inv_box.slot_id = SLOT_HUD_JUMPSUIT @@ -109,7 +109,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "o_clothing" inv_box.icon = ui_style inv_box.slot_id = SLOT_HUD_OUTER_SUIT @@ -119,7 +119,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory/hand() + inv_box = new /atom/movable/screen/inventory/hand() inv_box.name = "r_hand" inv_box.icon = ui_style inv_box.icon_state = "hand_r" @@ -129,7 +129,7 @@ inv_box.slot_id = SLOT_HUD_RIGHT_HAND static_inventory += inv_box - inv_box = new /obj/screen/inventory/hand() + inv_box = new /atom/movable/screen/inventory/hand() inv_box.name = "l_hand" inv_box.icon = ui_style inv_box.icon_state = "hand_l" @@ -139,7 +139,7 @@ inv_box.slot_id = SLOT_HUD_LEFT_HAND static_inventory += inv_box - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.name = "hand" using.icon = ui_style using.icon_state = "swap_1" @@ -148,7 +148,7 @@ using.alpha = ui_alpha static_inventory += using - using = new /obj/screen/swap_hand() + using = new /atom/movable/screen/swap_hand() using.name = "hand" using.icon = ui_style using.icon_state = "swap_2" @@ -157,7 +157,7 @@ using.alpha = ui_alpha static_inventory += using - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "id" inv_box.icon = ui_style inv_box.icon_state = "id" @@ -167,7 +167,7 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "pda" inv_box.icon = ui_style inv_box.icon_state = "pda" @@ -177,7 +177,7 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "mask" inv_box.icon = ui_style inv_box.icon_state = "mask" @@ -187,7 +187,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "back" inv_box.icon = ui_style inv_box.icon_state = "back" @@ -197,7 +197,7 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "storage1" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -207,7 +207,7 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "storage2" inv_box.icon = ui_style inv_box.icon_state = "pocket" @@ -217,7 +217,7 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "suit storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" @@ -227,28 +227,28 @@ inv_box.slot_id = SLOT_HUD_SUIT_STORE static_inventory += inv_box - using = new /obj/screen/resist() + using = new /atom/movable/screen/resist() using.icon = ui_style using.color = ui_color using.alpha = ui_alpha using.screen_loc = ui_pull_resist hotkeybuttons += using - using = new /obj/screen/human/toggle() + using = new /atom/movable/screen/human/toggle() using.icon = ui_style using.color = ui_color using.alpha = ui_alpha using.screen_loc = ui_inventory static_inventory += using - using = new /obj/screen/human/equip() + using = new /atom/movable/screen/human/equip() using.icon = ui_style using.color = ui_color using.alpha = ui_alpha using.screen_loc = ui_equip static_inventory += using - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "gloves" inv_box.icon = ui_style inv_box.icon_state = "gloves" @@ -258,7 +258,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "eyes" inv_box.icon = ui_style inv_box.icon_state = "glasses" @@ -268,7 +268,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "l_ear" inv_box.icon = ui_style inv_box.icon_state = "ears" @@ -278,7 +278,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "r_ear" inv_box.icon = ui_style inv_box.icon_state = "ears" @@ -288,7 +288,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "head" inv_box.icon = ui_style inv_box.icon_state = "head" @@ -298,7 +298,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "shoes" inv_box.icon = ui_style inv_box.icon_state = "shoes" @@ -308,7 +308,7 @@ inv_box.alpha = ui_alpha toggleable_inventory += inv_box - inv_box = new /obj/screen/inventory() + inv_box = new /atom/movable/screen/inventory() inv_box.name = "belt" inv_box.icon = ui_style inv_box.icon_state = "belt" @@ -318,33 +318,33 @@ inv_box.alpha = ui_alpha static_inventory += inv_box - mymob.throw_icon = new /obj/screen/throw_catch() + mymob.throw_icon = new /atom/movable/screen/throw_catch() mymob.throw_icon.icon = ui_style mymob.throw_icon.screen_loc = ui_drop_throw mymob.throw_icon.color = ui_color mymob.throw_icon.alpha = ui_alpha hotkeybuttons += mymob.throw_icon - mymob.healths = new /obj/screen/healths() + mymob.healths = new /atom/movable/screen/healths() infodisplay += mymob.healths mymob.healthdoll = new() infodisplay += mymob.healthdoll - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = ui_style mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) mymob.pullin.screen_loc = ui_pull_resist static_inventory += mymob.pullin - lingchemdisplay = new /obj/screen/ling/chems() + lingchemdisplay = new /atom/movable/screen/ling/chems() infodisplay += lingchemdisplay - lingstingdisplay = new /obj/screen/ling/sting() + lingstingdisplay = new /atom/movable/screen/ling/sting() infodisplay += lingstingdisplay - zone_select = new /obj/screen/zone_sel() + zone_select = new /atom/movable/screen/zone_sel() zone_select.color = ui_color zone_select.icon = ui_style zone_select.alpha = ui_alpha @@ -357,7 +357,7 @@ combo_display = new() infodisplay += combo_display - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) inv.hud = src inv_slots[inv.slot_id] = inv @@ -372,13 +372,13 @@ if(!istype(H) || !H.dna.species) return var/datum/species/S = H.dna.species - for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) + for(var/atom/movable/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) if(inv.slot_id in S.no_equip) inv.alpha = hud_alpha / 2 else inv.alpha = hud_alpha - for(var/obj/screen/craft/crafting in static_inventory) + for(var/atom/movable/screen/craft/crafting in static_inventory) if(!S.can_craft) crafting.invisibility = INVISIBILITY_ABSTRACT H.handcrafting?.close(H) diff --git a/code/_onclick/hud/map_popups.dm b/code/_onclick/hud/map_popups.dm index dc9e255cba93..fc12fae313e3 100644 --- a/code/_onclick/hud/map_popups.dm +++ b/code/_onclick/hud/map_popups.dm @@ -3,30 +3,15 @@ * Assoc list with all the active maps - when a screen obj is added to * a map, it's put in here as well. * - * Format: list( = list(/obj/screen)) + * Format: list( = list(/atom/movable/screen)) */ var/list/screen_maps = list() -/obj/screen - /** - * Map name assigned to this object. - * Automatically set by /client/proc/add_obj_to_map. - */ - var/assigned_map - /** - * Mark this object as garbage-collectible after you clean the map - * it was registered on. - * - * This could probably be changed to be a proc, for conditional removal. - * But for now, this works. - */ - var/del_on_map_removal = TRUE - /** * A screen object, which acts as a container for turfs and other things * you want to show on the map, which you usually attach to "vis_contents". */ -/obj/screen/map_view +/atom/movable/screen/map_view // Map view has to be on the lowest plane to enable proper lighting layer = GAME_PLANE plane = GAME_PLANE @@ -36,7 +21,7 @@ * It is also implicitly used to allocate a rectangle on the map, which will * be used for auto-scaling the map. */ -/obj/screen/background +/atom/movable/screen/background name = "background" icon = 'icons/mob/map_backgrounds.dmi' icon_state = "clear" @@ -49,7 +34,7 @@ * * If applicable, "assigned_map" has to be assigned before this proc call. */ -/obj/screen/proc/set_position(x, y, px = 0, py = 0) +/atom/movable/screen/proc/set_position(x, y, px = 0, py = 0) if(assigned_map) screen_loc = "[assigned_map]:[x]:[px],[y]:[py]" else @@ -60,7 +45,7 @@ * * If applicable, "assigned_map" has to be assigned before this proc call. */ -/obj/screen/proc/fill_rect(x1, y1, x2, y2) +/atom/movable/screen/proc/fill_rect(x1, y1, x2, y2) if(assigned_map) screen_loc = "[assigned_map]:[x1],[y1] to [x2],[y2]" else @@ -70,7 +55,7 @@ * Registers screen obj with the client, which makes it visible on the * assigned map, and becomes a part of the assigned map's lifecycle. */ -/client/proc/register_map_obj(obj/screen/screen_obj) +/client/proc/register_map_obj(atom/movable/screen/screen_obj) if(!screen_obj.assigned_map) CRASH("Can't register [screen_obj] without 'assigned_map' property.") if(!screen_maps[screen_obj.assigned_map]) @@ -92,7 +77,7 @@ /client/proc/clear_map(map_name) if(!map_name || !(map_name in screen_maps)) return FALSE - for(var/obj/screen/screen_obj in screen_maps[map_name]) + for(var/atom/movable/screen/screen_obj in screen_maps[map_name]) screen_maps[map_name] -= screen_obj if(screen_obj.del_on_map_removal) qdel(screen_obj) @@ -146,7 +131,7 @@ var/y_value = world.icon_size * tilesize * height var/map_name = create_popup(popup_name, x_value, y_value) - var/obj/screen/background/background = new + var/atom/movable/screen/background/background = new background.assigned_map = map_name background.fill_rect(1, 1, width, height) if(bg_icon) diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm index 366931cea333..f43effee417d 100644 --- a/code/_onclick/hud/movable_screen_objects.dm +++ b/code/_onclick/hud/movable_screen_objects.dm @@ -8,7 +8,7 @@ //Movable Screen Object //Not tied to the grid, places it's center where the cursor is -/obj/screen/movable +/atom/movable/screen/movable var/snap2grid = FALSE var/moved = FALSE var/locked = TRUE @@ -18,10 +18,10 @@ //Snap Screen Object //Tied to the grid, snaps to the nearest turf -/obj/screen/movable/snap +/atom/movable/screen/movable/snap snap2grid = TRUE -/obj/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params) +/atom/movable/screen/movable/MouseDrop(over_object, src_location, over_location, src_control, over_control, params) if(locked) //no! I am locked! begone! return @@ -55,7 +55,7 @@ set category = "Debug" set name = "Spawn Movable UI Object" - var/obj/screen/movable/M = new() + var/atom/movable/screen/movable/M = new() M.name = "Movable UI Object" M.icon_state = "block" M.maptext = "Movable" @@ -73,7 +73,7 @@ set category = "Debug" set name = "Spawn Snap UI Object" - var/obj/screen/movable/snap/S = new() + var/atom/movable/screen/movable/snap/S = new() S.name = "Snap UI Object" S.icon_state = "block" S.maptext = "Snap" diff --git a/code/_onclick/hud/other_mobs_hud.dm b/code/_onclick/hud/other_mobs_hud.dm index 0472a34dbef6..8e87c837df20 100644 --- a/code/_onclick/hud/other_mobs_hud.dm +++ b/code/_onclick/hud/other_mobs_hud.dm @@ -4,11 +4,11 @@ /datum/hud/simple_animal/New(mob/user) ..() - mymob.healths = new /obj/screen/healths() + mymob.healths = new /atom/movable/screen/healths() infodisplay += mymob.healths - var/obj/screen/using - using = new /obj/screen/act_intent/simple_animal() + var/atom/movable/screen/using + using = new /atom/movable/screen/act_intent/simple_animal() using.icon_state = mymob.a_intent static_inventory += using action_intent = using @@ -21,10 +21,10 @@ /datum/hud/corgi/New(mob/user) ..() - mymob.healths = new /obj/screen/healths/corgi() + mymob.healths = new /atom/movable/screen/healths/corgi() infodisplay += mymob.healths - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_corgi.dmi' mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index 75b34cfa1d3b..572538a1ab32 100644 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -1,7 +1,7 @@ /client var/list/parallax_layers var/list/parallax_layers_cached - var/static/list/parallax_static_layers_tail = newlist(/obj/screen/parallax_pmaster, /obj/screen/parallax_space_whitifier) + var/static/list/parallax_static_layers_tail = newlist(/atom/movable/screen/parallax_pmaster, /atom/movable/screen/parallax_space_whitifier) var/atom/movable/movingmob var/turf/previous_turf var/dont_animate_parallax //world.time of when we can state animate()ing parallax again @@ -16,7 +16,7 @@ if(!apply_parallax_pref()) return // this is needed so it blends properly with the space plane and blackness plane. - var/obj/screen/plane_master/space/S = plane_masters["[PLANE_SPACE]"] + var/atom/movable/screen/plane_master/space/S = plane_masters["[PLANE_SPACE]"] if(C.prefs.toggles2 & PREFTOGGLE_2_PARALLAX_IN_DARKNESS) S.color = rgb(0, 0, 0, 0) else @@ -27,16 +27,16 @@ S.appearance_flags |= NO_CLIENT_COLOR if(!length(C.parallax_layers_cached)) C.parallax_layers_cached = list() - C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view) - C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view) - C.parallax_layers_cached += new /obj/screen/parallax_layer/planet(null, C.view) + C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_1(null, C.view) + C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_2(null, C.view) + C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/planet(null, C.view) if(SSparallax.random_layer) C.parallax_layers_cached += new SSparallax.random_layer - C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view) + C.parallax_layers_cached += new /atom/movable/screen/parallax_layer/layer_3(null, C.view) C.parallax_layers = C.parallax_layers_cached.Copy() - var/obj/screen/plane_master/parallax/parallax_plane_master = plane_masters["[PLANE_SPACE_PARALLAX]"] + var/atom/movable/screen/plane_master/parallax/parallax_plane_master = plane_masters["[PLANE_SPACE_PARALLAX]"] if(C.prefs.toggles2 & PREFTOGGLE_2_PARALLAX_IN_DARKNESS) parallax_plane_master.blend_mode = BLEND_ADD else @@ -51,7 +51,7 @@ var/client/C = mymob.client C.screen -= (C.parallax_layers_cached + C.parallax_static_layers_tail) C.parallax_layers = null - var/obj/screen/plane_master/space/S = plane_masters["[PLANE_SPACE]"] + var/atom/movable/screen/plane_master/space/S = plane_masters["[PLANE_SPACE]"] S.color = null S.appearance_flags &= ~NO_CLIENT_COLOR @@ -101,7 +101,7 @@ if(!new_parallax_movedir) var/animate_time = 0 for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing + var/atom/movable/screen/parallax_layer/L = thing L.icon_state = initial(L.icon_state) L.update_o(C.view) var/T = PARALLAX_LOOP_TIME / L.speed @@ -123,7 +123,7 @@ var/shortesttimer for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing + var/atom/movable/screen/parallax_layer/L = thing var/T = PARALLAX_LOOP_TIME / L.speed if(isnull(shortesttimer)) @@ -148,7 +148,7 @@ /datum/hud/proc/update_parallax_motionblur(client/C, animatedir, new_parallax_movedir, matrix/newtransform) C.parallax_animate_timer = FALSE for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing + var/atom/movable/screen/parallax_layer/L = thing if(!new_parallax_movedir) animate(L) continue @@ -206,7 +206,7 @@ C.last_parallax_shift = world.time for(var/thing in C.parallax_layers) - var/obj/screen/parallax_layer/L = thing + var/atom/movable/screen/parallax_layer/L = thing L.update_status(mymob) if(L.view_sized != C.view) L.update_o(C.view) @@ -236,7 +236,7 @@ if(M && M.client && M.hud_used && length(M.client.parallax_layers)) M.hud_used.update_parallax() -/obj/screen/parallax_layer +/atom/movable/screen/parallax_layer icon = 'icons/effects/parallax.dmi' var/speed = 1 var/offset_x = 0 @@ -249,13 +249,13 @@ mouse_opacity = 0 -/obj/screen/parallax_layer/New(view) +/atom/movable/screen/parallax_layer/New(view) ..() if(!view) view = world.view update_o(view) -/obj/screen/parallax_layer/proc/update_o(view) +/atom/movable/screen/parallax_layer/proc/update_o(view) if(!view) view = world.view @@ -278,70 +278,70 @@ // Cache this view_sized = view -/obj/screen/parallax_layer/proc/update_status(mob/M) +/atom/movable/screen/parallax_layer/proc/update_status(mob/M) return -/obj/screen/parallax_layer/layer_1 +/atom/movable/screen/parallax_layer/layer_1 icon_state = "layer1" speed = 0.6 layer = 1 -/obj/screen/parallax_layer/layer_2 +/atom/movable/screen/parallax_layer/layer_2 icon_state = "layer2" speed = 1 layer = 2 -/obj/screen/parallax_layer/layer_3 +/atom/movable/screen/parallax_layer/layer_3 icon_state = "layer3" speed = 1.4 layer = 3 -/obj/screen/parallax_layer/random +/atom/movable/screen/parallax_layer/random blend_mode = BLEND_OVERLAY speed = 3 layer = 3 -/obj/screen/parallax_layer/random/space_gas +/atom/movable/screen/parallax_layer/random/space_gas icon_state = "space_gas" -/obj/screen/parallax_layer/random/space_gas/New(view) +/atom/movable/screen/parallax_layer/random/space_gas/New(view) ..() add_atom_colour(SSparallax.random_parallax_color, ADMIN_COLOUR_PRIORITY) -/obj/screen/parallax_layer/random/asteroids +/atom/movable/screen/parallax_layer/random/asteroids icon_state = "asteroids" layer = 4 -/obj/screen/parallax_layer/planet +/atom/movable/screen/parallax_layer/planet icon_state = "planet_lava" blend_mode = BLEND_OVERLAY absolute = TRUE //Status of seperation speed = 3 layer = 30 -/obj/screen/parallax_layer/planet/Initialize(mapload) +/atom/movable/screen/parallax_layer/planet/Initialize(mapload) . = ..() if(SSmapping.lavaland_theme?.planet_icon_state) icon_state = SSmapping.lavaland_theme.planet_icon_state -/obj/screen/parallax_layer/planet/update_status(mob/M) +/atom/movable/screen/parallax_layer/planet/update_status(mob/M) var/turf/T = get_turf(M) if(is_station_level(T.z)) invisibility = 0 else invisibility = INVISIBILITY_ABSTRACT -/obj/screen/parallax_layer/planet/update_o() +/atom/movable/screen/parallax_layer/planet/update_o() return //Shit wont move -/obj/screen/parallax_pmaster +/atom/movable/screen/parallax_pmaster appearance_flags = PLANE_MASTER plane = PLANE_SPACE_PARALLAX blend_mode = BLEND_MULTIPLY mouse_opacity = FALSE screen_loc = "CENTER-7,CENTER-7" -/obj/screen/parallax_space_whitifier +/atom/movable/screen/parallax_space_whitifier appearance_flags = PLANE_MASTER plane = PLANE_SPACE color = list( diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index eda0cc5640d6..aae4ce37001c 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -1,4 +1,4 @@ -/obj/screen/movable/pic_in_pic +/atom/movable/screen/movable/pic_in_pic name = "Picture-in-picture" screen_loc = "CENTER" plane = FLOOR_PLANE @@ -7,18 +7,18 @@ var/height = 0 var/list/shown_to = list() var/list/viewing_turfs = list() - var/obj/screen/component_button/button_x - var/obj/screen/component_button/button_expand - var/obj/screen/component_button/button_shrink + var/atom/movable/screen/component_button/button_x + var/atom/movable/screen/component_button/button_expand + var/atom/movable/screen/component_button/button_shrink var/mutable_appearance/standard_background var/const/max_dimensions = 10 -/obj/screen/movable/pic_in_pic/Initialize() +/atom/movable/screen/movable/pic_in_pic/Initialize() . = ..() make_backgrounds() -/obj/screen/movable/pic_in_pic/Destroy() +/atom/movable/screen/movable/pic_in_pic/Destroy() for(var/C in shown_to) unshow_to(C) QDEL_NULL(button_x) @@ -26,7 +26,7 @@ QDEL_NULL(button_expand) return ..() -/obj/screen/movable/pic_in_pic/component_click(obj/screen/component_button/component, params) +/atom/movable/screen/movable/pic_in_pic/component_click(atom/movable/screen/component_button/component, params) if(component == button_x) qdel(src) else if(component == button_expand) @@ -34,13 +34,13 @@ else if(component == button_shrink) set_view_size(width-1, height-1) -/obj/screen/movable/pic_in_pic/proc/make_backgrounds() +/atom/movable/screen/movable/pic_in_pic/proc/make_backgrounds() standard_background = new /mutable_appearance() standard_background.icon = 'icons/misc/pic_in_pic.dmi' standard_background.icon_state = "background" standard_background.layer = SPACE_LAYER -/obj/screen/movable/pic_in_pic/proc/add_buttons() +/atom/movable/screen/movable/pic_in_pic/proc/add_buttons() var/static/mutable_appearance/move_tab if(!move_tab) move_tab = new /mutable_appearance() @@ -55,7 +55,7 @@ overlays += move_tab if(!button_x) - button_x = new /obj/screen/component_button(null, src) + button_x = new /atom/movable/screen/component_button(null, src) var/mutable_appearance/MA = new /mutable_appearance() MA.name = "close" MA.icon = 'icons/misc/pic_in_pic.dmi' @@ -68,7 +68,7 @@ vis_contents += button_x if(!button_expand) - button_expand = new /obj/screen/component_button(null, src) + button_expand = new /atom/movable/screen/component_button(null, src) var/mutable_appearance/MA = new /mutable_appearance() MA.name = "expand" MA.icon = 'icons/misc/pic_in_pic.dmi' @@ -81,7 +81,7 @@ vis_contents += button_expand if(!button_shrink) - button_shrink = new /obj/screen/component_button(null, src) + button_shrink = new /atom/movable/screen/component_button(null, src) var/mutable_appearance/MA = new /mutable_appearance() MA.name = "shrink" MA.icon = 'icons/misc/pic_in_pic.dmi' @@ -93,7 +93,7 @@ button_shrink.transform = M vis_contents += button_shrink -/obj/screen/movable/pic_in_pic/proc/add_background() +/atom/movable/screen/movable/pic_in_pic/proc/add_background() if((width > 0) && (height > 0)) var/matrix/M = matrix() M.Scale(width + 0.5, height + 0.5) @@ -101,7 +101,7 @@ standard_background.transform = M overlays += standard_background -/obj/screen/movable/pic_in_pic/proc/set_view_size(width, height, do_refresh = TRUE) +/atom/movable/screen/movable/pic_in_pic/proc/set_view_size(width, height, do_refresh = TRUE) width = clamp(width, 0, max_dimensions) height = clamp(height, 0, max_dimensions) src.width = width @@ -115,12 +115,12 @@ if(do_refresh) refresh_view() -/obj/screen/movable/pic_in_pic/proc/set_view_center(atom/target, do_refresh = TRUE) +/atom/movable/screen/movable/pic_in_pic/proc/set_view_center(atom/target, do_refresh = TRUE) center = target if(do_refresh) refresh_view() -/obj/screen/movable/pic_in_pic/proc/refresh_view() +/atom/movable/screen/movable/pic_in_pic/proc/refresh_view() vis_contents -= viewing_turfs if(!width || !height) return @@ -133,12 +133,12 @@ vis_contents += viewing_turfs -/obj/screen/movable/pic_in_pic/proc/show_to(client/C) +/atom/movable/screen/movable/pic_in_pic/proc/show_to(client/C) if(C) shown_to[C] = 1 C.screen += src -/obj/screen/movable/pic_in_pic/proc/unshow_to(client/C) +/atom/movable/screen/movable/pic_in_pic/proc/unshow_to(client/C) if(C) shown_to -= C C.screen -= src diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index 8a59bb69275d..d9da09946af9 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -1,4 +1,4 @@ -/obj/screen/plane_master +/atom/movable/screen/plane_master screen_loc = "CENTER" icon_state = "blank" appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR @@ -6,58 +6,58 @@ var/show_alpha = 255 var/hide_alpha = 0 -/obj/screen/plane_master/proc/Show(override) +/atom/movable/screen/plane_master/proc/Show(override) alpha = override || show_alpha -/obj/screen/plane_master/proc/Hide(override) +/atom/movable/screen/plane_master/proc/Hide(override) alpha = override || hide_alpha //Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong. -/obj/screen/plane_master/proc/backdrop(mob/mymob) +/atom/movable/screen/plane_master/proc/backdrop(mob/mymob) addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, add_filter), "displace", 1, displacement_map_filter(render_source = GRAVITY_PULSE_RENDER_TARGET, size = 10)), 2 SECONDS)//Why a timer vs just apply on initialize / async? I don't know. It just can't be, neither works correctly. Don't lower below 2 seconds unless you can see effects through walls with no issue. -/obj/screen/plane_master/floor +/atom/movable/screen/plane_master/floor name = "floor plane master" plane = FLOOR_PLANE appearance_flags = PLANE_MASTER blend_mode = BLEND_OVERLAY -/obj/screen/plane_master/game_world +/atom/movable/screen/plane_master/game_world name = "game world plane master" plane = GAME_PLANE appearance_flags = PLANE_MASTER blend_mode = BLEND_OVERLAY -/obj/screen/plane_master/game_world/backdrop(mob/mymob) +/atom/movable/screen/plane_master/game_world/backdrop(mob/mymob) . = ..() //if you delete it so help me god clear_filters() if(istype(mymob) && mymob.client && mymob.client.prefs && (mymob.client.prefs.toggles & PREFTOGGLE_AMBIENT_OCCLUSION)) add_filter("AO", 1, drop_shadow_filter(x = 0, y = -2, size = 4, color = "#04080FAA")) -/obj/screen/plane_master/lighting +/atom/movable/screen/plane_master/lighting name = "lighting plane master" plane = LIGHTING_PLANE appearance_flags = PLANE_MASTER blend_mode = BLEND_MULTIPLY mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/screen/plane_master/lighting/backdrop(mob/mymob) +/atom/movable/screen/plane_master/lighting/backdrop(mob/mymob) . = ..() - mymob.overlay_fullscreen("lighting_backdrop_lit", /obj/screen/fullscreen/lighting_backdrop/lit) - mymob.overlay_fullscreen("lighting_backdrop_unlit", /obj/screen/fullscreen/lighting_backdrop/unlit) + mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/lighting_backdrop/lit) + mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/lighting_backdrop/unlit) -/obj/screen/plane_master/lighting/Initialize() +/atom/movable/screen/plane_master/lighting/Initialize() . = ..() add_filter("emissives", 1, alpha_mask_filter(render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)) -/obj/screen/plane_master/point +/atom/movable/screen/plane_master/point name = "point plane master" plane = POINT_PLANE appearance_flags = PLANE_MASTER //should use client color blend_mode = BLEND_OVERLAY -/obj/screen/plane_master/point/backdrop(mob/mymob) +/atom/movable/screen/plane_master/point/backdrop(mob/mymob) if(istype(mymob) && mymob.client && mymob.client.prefs) alpha = (mymob.client.prefs.toggles2 & PREFTOGGLE_2_THOUGHT_BUBBLE) ? 255 : 0 @@ -67,29 +67,29 @@ * Gets masked by blocking plane. Use for things that you want blocked by * mobs, items, etc. */ -/obj/screen/plane_master/emissive +/atom/movable/screen/plane_master/emissive name = "emissive plane master" plane = EMISSIVE_PLANE mouse_opacity = MOUSE_OPACITY_TRANSPARENT render_target = EMISSIVE_RENDER_TARGET -/obj/screen/plane_master/emissive/Initialize() +/atom/movable/screen/plane_master/emissive/Initialize() . = ..() add_filter("em_block_masking", 1, color_matrix_filter(GLOB.em_mask_matrix)) -/obj/screen/plane_master/space +/atom/movable/screen/plane_master/space name = "space plane master" plane = PLANE_SPACE appearance_flags = PLANE_MASTER blend_mode = BLEND_OVERLAY -/obj/screen/plane_master/parallax +/atom/movable/screen/plane_master/parallax name = "parallax plane master" plane = PLANE_SPACE_PARALLAX appearance_flags = PLANE_MASTER blend_mode = BLEND_MULTIPLY -/obj/screen/plane_master/blackness +/atom/movable/screen/plane_master/blackness name = "blackness plane master" plane = BLACKNESS_PLANE mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -97,7 +97,7 @@ blend_mode = BLEND_ADD appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR | PIXEL_SCALE -/obj/screen/plane_master/gravpulse +/atom/movable/screen/plane_master/gravpulse name = "gravpulse plane" mouse_opacity = MOUSE_OPACITY_TRANSPARENT plane = GRAVITY_PULSE_PLANE diff --git a/code/_onclick/hud/plane_master_controller.dm b/code/_onclick/hud/plane_master_controller.dm index aa67ed351724..c5bbbb743d28 100644 --- a/code/_onclick/hud/plane_master_controller.dm +++ b/code/_onclick/hud/plane_master_controller.dm @@ -11,7 +11,7 @@ owner_hud = hud var/assoc_controlled_planes = list() for(var/i in controlled_planes) - var/obj/screen/plane_master/instance = owner_hud.plane_masters["[i]"] + var/atom/movable/screen/plane_master/instance = owner_hud.plane_masters["[i]"] assoc_controlled_planes["[i]"] = instance controlled_planes = assoc_controlled_planes @@ -19,41 +19,41 @@ /atom/movable/plane_master_controller/add_filter(name, priority, list/params) . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.add_filter(name, priority, params) ///Full override so we can just use filterrific /atom/movable/plane_master_controller/remove_filter(name_or_names) . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.remove_filter(name_or_names) /atom/movable/plane_master_controller/update_filters() . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.update_filters() ///Gets all filters for this controllers plane masters /atom/movable/plane_master_controller/proc/get_filters(name) . = list() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] . += pm_iterator.get_filter(name) ///Transitions all filters owned by this plane master controller /atom/movable/plane_master_controller/transition_filter(name, time, list/new_params, easing, loop) . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.transition_filter(name, time, new_params, easing, loop) ///Full override so we can just use filterrific /atom/movable/plane_master_controller/add_atom_colour(coloration, colour_priority) . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.add_atom_colour(coloration, colour_priority) @@ -61,14 +61,14 @@ /atom/movable/plane_master_controller/remove_atom_colour(colour_priority, coloration) . = ..() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.remove_atom_colour(colour_priority, coloration) ///Resets the atom's color to null, and then sets it to the highest priority colour available /atom/movable/plane_master_controller/update_atom_colour() for(var/i in controlled_planes) - var/obj/screen/plane_master/pm_iterator = controlled_planes[i] + var/atom/movable/screen/plane_master/pm_iterator = controlled_planes[i] pm_iterator.update_atom_colour() diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 451e4270fe78..4ffc018f2fe1 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -3,51 +3,51 @@ GLOBAL_LIST_EMPTY(radial_menus) -/obj/screen/radial +/atom/movable/screen/radial icon = 'icons/mob/radial.dmi' layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE var/datum/radial_menu/parent -/obj/screen/radial/Destroy() +/atom/movable/screen/radial/Destroy() parent = null return ..() -/obj/screen/radial/slice +/atom/movable/screen/radial/slice icon_state = "radial_slice" var/choice var/next_page = FALSE -/obj/screen/radial/slice/MouseEntered(location, control, params) +/atom/movable/screen/radial/slice/MouseEntered(location, control, params) . = ..() icon_state = "radial_slice_focus" openToolTip(usr, src, params, title = name) -/obj/screen/radial/slice/MouseExited(location, control, params) +/atom/movable/screen/radial/slice/MouseExited(location, control, params) . = ..() icon_state = "radial_slice" closeToolTip(usr) -/obj/screen/radial/slice/Click(location, control, params) +/atom/movable/screen/radial/slice/Click(location, control, params) if(usr.client == parent.current_user) if(next_page) parent.next_page() else parent.element_chosen(choice,usr) -/obj/screen/radial/center +/atom/movable/screen/radial/center name = "Close Menu" icon_state = "radial_center" -/obj/screen/radial/center/Click(location, control, params) +/atom/movable/screen/radial/center/Click(location, control, params) if(usr.client == parent.current_user) parent.finished = TRUE -/obj/screen/radial/center/MouseEntered(location, control, params) +/atom/movable/screen/radial/center/MouseEntered(location, control, params) . = ..() openToolTip(usr, src, params, title = name) -/obj/screen/radial/center/MouseExited(location, control, params) +/atom/movable/screen/radial/center/MouseExited(location, control, params) . = ..() closeToolTip(usr) @@ -59,8 +59,8 @@ GLOBAL_LIST_EMPTY(radial_menus) var/selected_choice - var/list/obj/screen/elements = list() - var/obj/screen/radial/center/close_button + var/list/atom/movable/screen/elements = list() + var/atom/movable/screen/radial/center/close_button var/client/current_user var/atom/movable/anchor var/pixel_x_difference @@ -94,7 +94,7 @@ GLOBAL_LIST_EMPTY(radial_menus) if(elements.len < max_elements) var/elements_to_add = max_elements - elements.len for(var/i in 1 to elements_to_add) //Create all elements - var/obj/screen/radial/new_element = new /obj/screen/radial/slice + var/atom/movable/screen/radial/new_element = new /atom/movable/screen/radial/slice new_element.parent = src elements += new_element @@ -128,14 +128,14 @@ GLOBAL_LIST_EMPTY(radial_menus) pixel_x_difference = ((world.icon_size * anchor.x) + anchor.step_x + anchor.pixel_x) - ((world.icon_size * current_user.mob.x) + current_user.mob.step_x + current_user.mob.pixel_x) pixel_y_difference = ((world.icon_size * anchor.y) + anchor.step_y + anchor.pixel_y) - ((world.icon_size * current_user.mob.y) + current_user.mob.step_y + current_user.mob.pixel_y) for(var/i in 1 to elements.len) - var/obj/screen/radial/E = elements[i] + var/atom/movable/screen/radial/E = elements[i] var/angle = WRAP(starting_angle + (i - 1) * angle_per_element, 0, 360) if(i > page_choices.len) HideElement(E) else SetElement(E,page_choices[i], angle) -/datum/radial_menu/proc/HideElement(obj/screen/radial/slice/E) +/datum/radial_menu/proc/HideElement(atom/movable/screen/radial/slice/E) E.cut_overlays() E.alpha = 0 E.name = "None" @@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(radial_menus) E.choice = null E.next_page = FALSE -/datum/radial_menu/proc/SetElement(obj/screen/radial/slice/E, choice_id, angle) +/datum/radial_menu/proc/SetElement(atom/movable/screen/radial/slice/E, choice_id, angle) //Position E.pixel_y = round(cos(angle) * radius) + py_shift E.pixel_x = round(sin(angle) * radius) diff --git a/code/_onclick/hud/robot_hud.dm b/code/_onclick/hud/robot_hud.dm index 1ec455d9274c..c34807563c54 100644 --- a/code/_onclick/hud/robot_hud.dm +++ b/code/_onclick/hud/robot_hud.dm @@ -1,11 +1,11 @@ -/obj/screen/robot +/atom/movable/screen/robot icon = 'icons/mob/screen_robot.dmi' -/obj/screen/robot/module +/atom/movable/screen/robot/module name = "cyborg module" icon_state = "nomod" -/obj/screen/robot/module/Click() +/atom/movable/screen/robot/module/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr if(R.module) @@ -13,76 +13,76 @@ return 1 R.pick_module() -/obj/screen/robot/module1 +/atom/movable/screen/robot/module1 name = "module1" icon_state = "inv1" -/obj/screen/robot/module1/Click() +/atom/movable/screen/robot/module1/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.toggle_module(1) -/obj/screen/robot/module2 +/atom/movable/screen/robot/module2 name = "module2" icon_state = "inv2" -/obj/screen/robot/module2/Click() +/atom/movable/screen/robot/module2/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.toggle_module(2) -/obj/screen/robot/module3 +/atom/movable/screen/robot/module3 name = "module3" icon_state = "inv3" -/obj/screen/robot/module3/Click() +/atom/movable/screen/robot/module3/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.toggle_module(3) -/obj/screen/robot/radio +/atom/movable/screen/robot/radio name = "radio" icon_state = "radio" -/obj/screen/robot/radio/Click() +/atom/movable/screen/robot/radio/Click() if(issilicon(usr)) var/mob/living/silicon/robot/R = usr R.radio_menu() -/obj/screen/robot/store +/atom/movable/screen/robot/store name = "store" icon_state = "store" -/obj/screen/robot/store/Click() +/atom/movable/screen/robot/store/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.uneq_active() R.hud_used.update_robot_modules_display() -/obj/screen/robot/lamp +/atom/movable/screen/robot/lamp name = "Toggle Headlamp" icon_state = "lamp0" screen_loc = ui_borg_lamp -/obj/screen/robot/lamp/Click() +/atom/movable/screen/robot/lamp/Click() if(isrobot(usr)) var/mob/living/silicon/robot/R = usr R.control_headlamp() -/obj/screen/robot/thrusters +/atom/movable/screen/robot/thrusters name = "ion thrusters" icon_state = "ionpulse0" -/obj/screen/robot/thrusters/Click() +/atom/movable/screen/robot/thrusters/Click() var/mob/living/silicon/robot/R = usr R.toggle_ionpulse() -/obj/screen/robot/mov_intent +/atom/movable/screen/robot/mov_intent name = "fast/slow toggle" icon_state = "running" -/obj/screen/robot/mov_intent/Click() +/atom/movable/screen/robot/mov_intent/Click() usr.toggle_move_intent() @@ -93,31 +93,31 @@ /datum/hud/robot/New(mob/user) ..() - var/obj/screen/using + var/atom/movable/screen/using var/mob/living/silicon/robot/mymobR = mymob //Language menu - using = new /obj/screen/language_menu + using = new /atom/movable/screen/language_menu using.screen_loc = ui_borg_lanugage_menu static_inventory += using //Radio - using = new /obj/screen/robot/radio() + using = new /atom/movable/screen/robot/radio() using.screen_loc = ui_borg_radio static_inventory += using //Module select - using = new /obj/screen/robot/module1() + using = new /atom/movable/screen/robot/module1() using.screen_loc = ui_inv1 static_inventory += using mymobR.inv1 = using - using = new /obj/screen/robot/module2() + using = new /atom/movable/screen/robot/module2() using.screen_loc = ui_inv2 static_inventory += using mymobR.inv2 = using - using = new /obj/screen/robot/module3() + using = new /atom/movable/screen/robot/module3() using.screen_loc = ui_inv3 static_inventory += using mymobR.inv3 = using @@ -125,55 +125,55 @@ //End of module select //Sec/Med HUDs - using = new /obj/screen/ai/sensors() + using = new /atom/movable/screen/ai/sensors() using.screen_loc = ui_borg_sensor static_inventory += using //Intent // Attack intent - using = new /obj/screen/act_intent/robot() + using = new /atom/movable/screen/act_intent/robot() using.icon_state = mymob.a_intent static_inventory += using action_intent = using // Movement intent - using = new /obj/screen/robot/mov_intent() + using = new /atom/movable/screen/robot/mov_intent() using.icon_state = (mymob.m_intent == MOVE_INTENT_RUN ? "running" : "walking") static_inventory += using using.screen_loc = ui_movi move_intent = using //Health - mymob.healths = new /obj/screen/healths/robot() + mymob.healths = new /atom/movable/screen/healths/robot() infodisplay += mymob.healths //Installed Module - mymobR.hands = new /obj/screen/robot/module() + mymobR.hands = new /atom/movable/screen/robot/module() mymobR.hands.screen_loc = ui_borg_module static_inventory += mymobR.hands - module_store_icon = new /obj/screen/robot/store() + module_store_icon = new /atom/movable/screen/robot/store() module_store_icon.screen_loc = ui_borg_store - mymob.pullin = new /obj/screen/pull() + mymob.pullin = new /atom/movable/screen/pull() mymob.pullin.icon = 'icons/mob/screen_robot.dmi' mymob.pullin.hud = src mymob.pullin.update_icon(UPDATE_ICON_STATE) mymob.pullin.screen_loc = ui_borg_pull hotkeybuttons += mymob.pullin - zone_select = new /obj/screen/zone_sel/robot() + zone_select = new /atom/movable/screen/zone_sel/robot() zone_select.hud = src zone_select.update_icon(UPDATE_OVERLAYS) static_inventory += zone_select //Headlamp - mymobR.lamp_button = new /obj/screen/robot/lamp() + mymobR.lamp_button = new /atom/movable/screen/robot/lamp() mymobR.lamp_button.screen_loc = ui_borg_lamp static_inventory += mymobR.lamp_button //Thrusters - using = new /obj/screen/robot/thrusters() + using = new /atom/movable/screen/robot/thrusters() using.screen_loc = ui_borg_thrusters static_inventory += using mymobR.thruster_button = using diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 492e0e01cb57..c68d9c797ccd 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -1,34 +1,44 @@ /* - Screen objects + Screen "objects" Todo: improve/re-implement Screen objects are only used for the hud and should not appear anywhere "in-game". + They are not actually objects, which is counterintuitive to their name. They are used with the client/screen list and the screen_loc var. For more information, see the byond documentation on the screen_loc and screen vars. */ -/obj/screen +/atom/movable/screen name = "" icon = 'icons/mob/screen_gen.dmi' layer = HUD_LAYER plane = HUD_PLANE flags = NO_SCREENTIPS - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/obj/master = null //A reference to the object in the slot. Grabs or items, generally. var/datum/hud/hud = null appearance_flags = NO_CLIENT_COLOR - -/obj/screen/take_damage() - return - -/obj/screen/Destroy() + /** + * Map name assigned to this object. + * Automatically set by /client/proc/add_obj_to_map. + */ + var/assigned_map + /** + * Mark this object as garbage-collectible after you clean the map + * it was registered on. + * + * This could probably be changed to be a proc, for conditional removal. + * But for now, this works. + */ + var/del_on_map_removal = TRUE + +/atom/movable/screen/Destroy() master = null hud = null return ..() -/obj/screen/proc/component_click(obj/screen/component_button/component, params) +/atom/movable/screen/proc/component_click(atom/movable/screen/component_button/component, params) return -/obj/screen/text +/atom/movable/screen/text icon = null icon_state = null mouse_opacity = MOUSE_OPACITY_TRANSPARENT @@ -36,44 +46,44 @@ maptext_height = 480 maptext_width = 480 -/obj/screen/close +/atom/movable/screen/close name = "close" layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE -/obj/screen/close/Click() +/atom/movable/screen/close/Click() if(master) if(isstorage(master)) var/obj/item/storage/S = master S.close(usr) return 1 -/obj/screen/drop +/atom/movable/screen/drop name = "drop" icon_state = "act_drop" -/obj/screen/drop/Click() +/atom/movable/screen/drop/Click() usr.drop_item_v() -/obj/screen/grab +/atom/movable/screen/grab name = "grab" -/obj/screen/grab/Click() +/atom/movable/screen/grab/Click() var/obj/item/grab/G = master G.s_click(src) return 1 -/obj/screen/grab/attack_hand() +/atom/movable/screen/grab/attack_hand() return -/obj/screen/grab/attackby() +/atom/movable/screen/grab/attackby() return -/obj/screen/act_intent +/atom/movable/screen/act_intent name = "intent" icon_state = "help" screen_loc = ui_acti -/obj/screen/act_intent/Click(location, control, params) +/atom/movable/screen/act_intent/Click(location, control, params) if(ishuman(usr)) var/_x = text2num(params2list(params)["icon-x"]) var/_y = text2num(params2list(params)["icon-y"]) @@ -88,69 +98,69 @@ else usr.a_intent_change("right") -/obj/screen/act_intent/alien +/atom/movable/screen/act_intent/alien icon = 'icons/mob/screen_alien.dmi' screen_loc = ui_acti -/obj/screen/act_intent/robot +/atom/movable/screen/act_intent/robot icon = 'icons/mob/screen_robot.dmi' screen_loc = ui_borg_intents -/obj/screen/act_intent/robot/AI +/atom/movable/screen/act_intent/robot/AI screen_loc = "SOUTH+1:6,EAST-1:32" -/obj/screen/mov_intent +/atom/movable/screen/mov_intent name = "run/walk toggle" icon_state = "running" -/obj/screen/act_intent/simple_animal +/atom/movable/screen/act_intent/simple_animal icon = 'icons/mob/screen_simplemob.dmi' screen_loc = ui_acti -/obj/screen/act_intent/guardian +/atom/movable/screen/act_intent/guardian icon = 'icons/mob/guardian.dmi' screen_loc = ui_acti -/obj/screen/mov_intent/Click() +/atom/movable/screen/mov_intent/Click() usr.toggle_move_intent() -/obj/screen/pull +/atom/movable/screen/pull name = "stop pulling" icon_state = "pull" -/obj/screen/pull/Click() +/atom/movable/screen/pull/Click() usr.stop_pulling() -/obj/screen/pull/update_icon_state() +/atom/movable/screen/pull/update_icon_state() if(hud?.mymob?.pulling) icon_state = "pull" else icon_state = "pull0" -/obj/screen/resist +/atom/movable/screen/resist name = "resist" icon = 'icons/mob/screen_midnight.dmi' icon_state = "act_resist" -/obj/screen/resist/Click() +/atom/movable/screen/resist/Click() if(isliving(usr)) var/mob/living/L = usr L.resist() -/obj/screen/throw_catch +/atom/movable/screen/throw_catch name = "throw/catch" icon = 'icons/mob/screen_midnight.dmi' icon_state = "act_throw_off" -/obj/screen/throw_catch/Click() +/atom/movable/screen/throw_catch/Click() if(iscarbon(usr)) var/mob/living/carbon/C = usr C.toggle_throw_mode() -/obj/screen/storage +/atom/movable/screen/storage name = "storage" -/obj/screen/storage/Click(location, control, params) +/atom/movable/screen/storage/Click(location, control, params) if(world.time <= usr.next_move) return TRUE if(usr.incapacitated(ignore_restraints = TRUE)) @@ -163,7 +173,7 @@ master.attackby(I, usr, params) return TRUE -/obj/screen/storage/proc/is_item_accessible(obj/item/I, mob/user) +/atom/movable/screen/storage/proc/is_item_accessible(obj/item/I, mob/user) if(!user || !I) return FALSE @@ -180,7 +190,7 @@ return TRUE return FALSE -/obj/screen/storage/MouseDrop_T(obj/item/I, mob/user) +/atom/movable/screen/storage/MouseDrop_T(obj/item/I, mob/user) if(!user || !istype(I) || user.incapacitated(ignore_restraints = TRUE) || ismecha(user.loc) || !master) return @@ -219,7 +229,7 @@ S.attackby(I, user) return TRUE -/obj/screen/zone_sel +/atom/movable/screen/zone_sel name = "damage zone" icon_state = "zone_sel" screen_loc = ui_zonesel @@ -228,7 +238,7 @@ var/static/list/hover_overlays_cache = list() var/hovering -/obj/screen/zone_sel/Click(location, control,params) +/atom/movable/screen/zone_sel/Click(location, control,params) if(isobserver(usr)) return @@ -241,11 +251,11 @@ return set_selected_zone(choice, usr) -/obj/screen/zone_sel/MouseEntered(location, control, params) +/atom/movable/screen/zone_sel/MouseEntered(location, control, params) . = ..() MouseMove(location, control, params) -/obj/screen/zone_sel/MouseMove(location, control, params) +/atom/movable/screen/zone_sel/MouseMove(location, control, params) if(isobserver(usr)) return @@ -275,13 +285,13 @@ layer = ABOVE_HUD_LAYER plane = ABOVE_HUD_PLANE -/obj/screen/zone_sel/MouseExited(location, control, params) +/atom/movable/screen/zone_sel/MouseExited(location, control, params) if(!isobserver(usr) && hovering) cut_overlay(hover_overlays_cache[hovering]) hovering = null return ..() -/obj/screen/zone_sel/proc/get_zone_at(icon_x, icon_y) +/atom/movable/screen/zone_sel/proc/get_zone_at(icon_x, icon_y) switch(icon_y) if(1 to 3) //Feet switch(icon_x) @@ -325,7 +335,7 @@ return "eyes" return "head" -/obj/screen/zone_sel/proc/set_selected_zone(choice) +/atom/movable/screen/zone_sel/proc/set_selected_zone(choice) if(!hud) return if(isobserver(hud.mymob)) @@ -334,58 +344,58 @@ if(choice != selecting) selecting = choice update_icon(UPDATE_OVERLAYS) - return 1 + return TRUE -/obj/screen/zone_sel/update_overlays() +/atom/movable/screen/zone_sel/update_overlays() . = ..() var/image/sel = image(overlay_file, "[selecting]") sel.appearance_flags = RESET_COLOR . += sel hud.mymob.zone_selected = selecting -/obj/screen/zone_sel/alien +/atom/movable/screen/zone_sel/alien icon = 'icons/mob/screen_alien.dmi' overlay_file = 'icons/mob/screen_alien.dmi' -/obj/screen/zone_sel/robot +/atom/movable/screen/zone_sel/robot icon = 'icons/mob/screen_robot.dmi' -/obj/screen/craft +/atom/movable/screen/craft name = "crafting menu" icon = 'icons/mob/screen_midnight.dmi' icon_state = "craft" screen_loc = ui_crafting -/obj/screen/craft/Click() +/atom/movable/screen/craft/Click() var/mob/living/M = usr M.OpenCraftingMenu() -/obj/screen/language_menu +/atom/movable/screen/language_menu name = "language menu" icon = 'icons/mob/screen_midnight.dmi' icon_state = "talk_wheel" screen_loc = ui_language_menu -/obj/screen/language_menu/Click() +/atom/movable/screen/language_menu/Click() var/mob/M = usr if(!istype(M)) return M.check_languages() -/obj/screen/inventory +/atom/movable/screen/inventory var/slot_id //The indentifier for the slot. It has nothing to do with ID cards. var/list/object_overlays = list() -/obj/screen/inventory/MouseEntered() +/atom/movable/screen/inventory/MouseEntered() . = ..() add_overlays() -/obj/screen/inventory/MouseExited() +/atom/movable/screen/inventory/MouseExited() ..() cut_overlay(object_overlays) object_overlays.Cut() -/obj/screen/inventory/proc/add_overlays() +/atom/movable/screen/inventory/proc/add_overlays() var/mob/user = hud.mymob if(hud && user && slot_id) @@ -405,7 +415,7 @@ object_overlays += item_overlay add_overlay(object_overlays) -/obj/screen/inventory/MouseDrop(atom/over) +/atom/movable/screen/inventory/MouseDrop(atom/over) cut_overlay(object_overlays) object_overlays.Cut() if(could_be_click_lag()) @@ -414,7 +424,7 @@ return return ..() -/obj/screen/inventory/Click(location, control, params) +/atom/movable/screen/inventory/Click(location, control, params) // At this point in client Click() code we have passed the 1/10 sec check and little else // We don't even know if it's a middle click if(world.time <= usr.next_move) @@ -432,14 +442,14 @@ if(usr.attack_ui(slot_id)) usr.update_inv_l_hand() usr.update_inv_r_hand() - return 1 + return TRUE -/obj/screen/inventory/hand +/atom/movable/screen/inventory/hand var/image/active_overlay var/image/handcuff_overlay var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked") -/obj/screen/inventory/hand/update_overlays() +/atom/movable/screen/inventory/hand/update_overlays() . = ..() if(!active_overlay) active_overlay = image("icon"=icon, "icon_state"="hand_active") @@ -462,7 +472,7 @@ else if(slot_id == SLOT_HUD_RIGHT_HAND && !hud.mymob.hand) . += active_overlay -/obj/screen/inventory/hand/Click() +/atom/movable/screen/inventory/hand/Click() // At this point in client Click() code we have passed the 1/10 sec check and little else // We don't even know if it's a middle click if(world.time <= usr.next_move) @@ -479,12 +489,12 @@ M.activate_hand("r") if("left hand", "l_hand") M.activate_hand("l") - return 1 + return TRUE -/obj/screen/swap_hand +/atom/movable/screen/swap_hand name = "swap hand" -/obj/screen/swap_hand/Click() +/atom/movable/screen/swap_hand/Click() // At this point in client Click() code we have passed the 1/10 sec check and little else // We don't even know if it's a middle click if(world.time <= usr.next_move) @@ -498,57 +508,57 @@ M.swap_hand() return 1 -/obj/screen/healths +/atom/movable/screen/healths name = "health" icon_state = "health0" screen_loc = ui_health -/obj/screen/healths/alien +/atom/movable/screen/healths/alien icon = 'icons/mob/screen_alien.dmi' screen_loc = ui_alien_health -/obj/screen/healths/bot +/atom/movable/screen/healths/bot icon = 'icons/mob/screen_bot.dmi' screen_loc = ui_borg_health -/obj/screen/healths/robot +/atom/movable/screen/healths/robot icon = 'icons/mob/screen_robot.dmi' screen_loc = ui_borg_health -/obj/screen/healths/corgi +/atom/movable/screen/healths/corgi icon = 'icons/mob/screen_corgi.dmi' -/obj/screen/healths/slime +/atom/movable/screen/healths/slime icon = 'icons/mob/screen_slime.dmi' icon_state = "slime_health0" screen_loc = ui_slime_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/screen/healths/guardian +/atom/movable/screen/healths/guardian name = "summoner health" icon = 'icons/mob/guardian.dmi' icon_state = "base" screen_loc = ui_health mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/screen/healthdoll +/atom/movable/screen/healthdoll name = "health doll" icon_state = "healthdoll_DEAD" screen_loc = ui_healthdoll var/list/cached_healthdoll_overlays = list() // List of icon states (strings) for overlays -/obj/screen/healthdoll/Click() +/atom/movable/screen/healthdoll/Click() if(ishuman(usr) && !usr.is_dead()) var/mob/living/carbon/H = usr H.check_self_for_injuries() -/obj/screen/component_button - var/obj/screen/parent +/atom/movable/screen/component_button + var/atom/movable/screen/parent -/obj/screen/component_button/Initialize(mapload, obj/screen/new_parent) +/atom/movable/screen/component_button/Initialize(mapload, atom/movable/screen/new_parent) . = ..() parent = new_parent -/obj/screen/component_button/Click(params) +/atom/movable/screen/component_button/Click(params) if(parent) parent.component_click(src, params) diff --git a/code/_onclick/hud/screentip.dm b/code/_onclick/hud/screentip.dm index beb8f033b9fd..542c96e626f2 100644 --- a/code/_onclick/hud/screentip.dm +++ b/code/_onclick/hud/screentip.dm @@ -1,4 +1,4 @@ -/obj/screen/screentip +/atom/movable/screen/screentip icon = null mouse_opacity = MOUSE_OPACITY_TRANSPARENT screen_loc = "TOP,LEFT" @@ -7,12 +7,12 @@ maptext_y = -50 maptext = "" -/obj/screen/screentip/Initialize(mapload, _hud) +/atom/movable/screen/screentip/Initialize(mapload, _hud) . = ..() hud = _hud update_view() -/obj/screen/screentip/proc/update_view(datum/source) +/atom/movable/screen/screentip/proc/update_view(datum/source) if(!hud) //Might not have been initialized by now return maptext_width = getviewsize(hud.mymob.client.view)[1] * world.icon_size diff --git a/code/_onclick/hud/slime_hud.dm b/code/_onclick/hud/slime_hud.dm index 273991a83c84..58a579e3599b 100644 --- a/code/_onclick/hud/slime_hud.dm +++ b/code/_onclick/hud/slime_hud.dm @@ -1,6 +1,6 @@ /datum/hud/slime/New(mob/living/simple_animal/slime/owner, ui_style = 'icons/mob/screen_slime.dmi') ..() - mymob.healths = new /obj/screen/healths/slime() + mymob.healths = new /atom/movable/screen/healths/slime() infodisplay += mymob.healths /mob/living/simple_animal/slime/create_mob_hud() diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 8df9f1958dcf..a1d096a24741 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -6,7 +6,8 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) -/datum/controller/failsafe // This thing pretty much just keeps poking the master controller +/// This thing pretty much just keeps poking the master controller +/datum/controller/failsafe name = "Failsafe" // The length of time to check on the MC (in deciseconds). diff --git a/code/controllers/subsystem/SSdebugview.dm b/code/controllers/subsystem/SSdebugview.dm index 0f973a5deb21..bbc2082c582c 100644 --- a/code/controllers/subsystem/SSdebugview.dm +++ b/code/controllers/subsystem/SSdebugview.dm @@ -44,7 +44,7 @@ SUBSYSTEM_DEF(debugview) C.debug_text_overlay.maptext = "[out_text]" /datum/controller/subsystem/debugview/proc/start_processing(client/C) - C.debug_text_overlay = new /obj/screen/debugtextholder(null, C) + C.debug_text_overlay = new /atom/movable/screen/debugtextholder(null, C) C.screen |= C.debug_text_overlay processing |= C @@ -53,7 +53,7 @@ SUBSYSTEM_DEF(debugview) C.screen -= C.debug_text_overlay QDEL_NULL(C.debug_text_overlay) -/obj/screen/debugtextholder +/atom/movable/screen/debugtextholder icon = 'icons/mob/screen_full.dmi' icon_state = "empty" screen_loc = "TOP,LEFT" @@ -61,11 +61,11 @@ SUBSYSTEM_DEF(debugview) maptext_height = 480 // 15 * 32 (15 tiles, 32 pixels each) maptext_width = 480 // changes with prefs -/obj/screen/debugtextholder/Initialize(mapload, client/C) +/atom/movable/screen/debugtextholder/Initialize(mapload, client/C) . = ..() update_view(C) -/obj/screen/debugtextholder/proc/update_view(client/C) +/atom/movable/screen/debugtextholder/proc/update_view(client/C) var/list/viewsizes = getviewsize(C.view) maptext_width = viewsizes[1] * world.icon_size diff --git a/code/controllers/subsystem/SSghost_spawns.dm b/code/controllers/subsystem/SSghost_spawns.dm index 9811088f742d..80e275ce9a1c 100644 --- a/code/controllers/subsystem/SSghost_spawns.dm +++ b/code/controllers/subsystem/SSghost_spawns.dm @@ -70,7 +70,7 @@ SUBSYSTEM_DEF(ghost_spawns) // If we somehow send two polls for the same mob type, but with a duration on the second one shorter than the time left on the first one, // we need to keep the first one's timeout rather than use the shorter one - var/obj/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category) + var/atom/movable/screen/alert/notify_action/current_alert = LAZYACCESS(M.alerts, category) var/alert_time = poll_time var/alert_poll = P if(current_alert && current_alert.timeout > (world.time + poll_time - world.tick_lag)) @@ -78,7 +78,7 @@ SUBSYSTEM_DEF(ghost_spawns) alert_poll = current_alert.poll // Send them an on-screen alert - var/obj/screen/alert/notify_action/A = M.throw_alert(category, /obj/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE) + var/atom/movable/screen/alert/notify_action/A = M.throw_alert(category, /atom/movable/screen/alert/notify_action, timeout_override = alert_time, no_anim = TRUE) if(!A) continue diff --git a/code/controllers/subsystem/SSparallax.dm b/code/controllers/subsystem/SSparallax.dm index c0beb503d66a..99024fd0d1e9 100644 --- a/code/controllers/subsystem/SSparallax.dm +++ b/code/controllers/subsystem/SSparallax.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(parallax) /datum/controller/subsystem/parallax/PreInit() . = ..() if(prob(70)) //70% chance to pick a special extra layer - random_layer = pick(/obj/screen/parallax_layer/random/space_gas, /obj/screen/parallax_layer/random/asteroids) + random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids) random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE) //Special color for random_layer1. Has to be done here so everyone sees the same color. planet_y_offset = rand(100, 160) planet_x_offset = rand(100, 160) diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm index 2c500571b4e1..03513434cdb6 100644 --- a/code/controllers/subsystem/SSticker.dm +++ b/code/controllers/subsystem/SSticker.dm @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(ticker) /// Holder for inital autotransfer vote timer var/next_autotransfer = 0 /// Used for station explosion cinematic - var/obj/screen/cinematic = null + var/atom/movable/screen/cinematic = null /// Spam Prevention. Announce round end only once. var/round_end_announced = FALSE /// Is the ticker currently processing? If FALSE, roundstart is delayed @@ -364,7 +364,7 @@ SUBSYSTEM_DEF(ticker) auto_toggle_ooc(TRUE) // Turn it on //initialise our cinematic screen object - cinematic = new /obj/screen(src) + cinematic = new /atom/movable/screen(src) cinematic.icon = 'icons/effects/station_explosion.dmi' cinematic.icon_state = "station_intact" cinematic.layer = 21 diff --git a/code/datums/action.dm b/code/datums/action.dm index 0e6dc66076dc..18fd40867741 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -12,7 +12,7 @@ var/desc = null var/obj/target = null var/check_flags = 0 - var/obj/screen/movable/action_button/button = null + var/atom/movable/screen/movable/action_button/button = null var/button_icon = 'icons/mob/actions/actions.dmi' var/background_icon_state = "bg_default" var/buttontooltipstyle = "" @@ -129,7 +129,7 @@ img.plane = FLOAT_PLANE + 1 button.add_overlay(img) -/datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button) +/datum/action/proc/ApplyIcon(atom/movable/screen/movable/action_button/current_button) current_button.cut_overlays() if(icon_icon && button_icon_state) var/image/img = image(icon_icon, current_button, button_icon_state) @@ -165,7 +165,7 @@ I.ui_action_click(owner, type, left_click) return TRUE -/datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button) +/datum/action/item_action/ApplyIcon(atom/movable/screen/movable/action_button/current_button) if(use_itemicon) if(target) var/obj/item/I = target @@ -436,7 +436,7 @@ owner.research_scanner = FALSE ..() -/datum/action/item_action/toggle_research_scanner/ApplyIcon(obj/screen/movable/action_button/current_button) +/datum/action/item_action/toggle_research_scanner/ApplyIcon(atom/movable/screen/movable/action_button/current_button) current_button.cut_overlays() if(button_icon && button_icon_state) var/image/img = image(button_icon, current_button, "scan_mode") diff --git a/code/datums/click_intercept.dm b/code/datums/click_intercept.dm index 953e1272602f..78e8c8725f7d 100644 --- a/code/datums/click_intercept.dm +++ b/code/datums/click_intercept.dm @@ -8,8 +8,8 @@ /datum/click_intercept /// A reference to the client which is assigned this click intercept datum. var/client/holder = null - /// Any `obj/screen/buttons` the client is meant to receive when assigned this click intercept datum. - var/list/obj/screen/buttons = list() + /// Any `atom/movable/screen/buttons` the client is meant to receive when assigned this click intercept datum. + var/list/atom/movable/screen/buttons = list() /datum/click_intercept/New(client/C) create_buttons() diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index f5190f322b59..ede04d3da1f0 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -15,7 +15,8 @@ Bonus ////////////////////////////////////// */ -/datum/symptom/dizzy // Not the egg +/// Not the egg +/datum/symptom/dizzy name = "Dizziness" stealth = 2 diff --git a/code/datums/keybindings/mob_keybinds.dm b/code/datums/keybindings/mob_keybinds.dm index c2f782dd024d..55122bff7937 100644 --- a/code/datums/keybindings/mob_keybinds.dm +++ b/code/datums/keybindings/mob_keybinds.dm @@ -168,7 +168,7 @@ if(!C.check_has_body_select()) return - var/obj/screen/zone_sel/selector = C.mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = C.mob.hud_used.zone_select selector.set_selected_zone(body_part, C.mob) /datum/keybinding/mob/target/head @@ -225,7 +225,8 @@ name = "Target Left Foot" body_part = BODY_ZONE_PRECISE_L_FOOT -/datum/keybinding/mob/trigger_action_button // Don't add a name to this, shouldn't show up in the prefs menu +/// Don't add a name to this, shouldn't show up in the prefs menu +/datum/keybinding/mob/trigger_action_button var/datum/action/linked_action var/binded_to // these are expected to actually get deleted at some point, to prevent hard deletes we need to know where to remove them from the clients list diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index c64099993e3c..671ac42da62d 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -954,7 +954,8 @@ back = /obj/item/mod/control/pre_equipped/traitor shoes = /obj/item/clothing/shoes/magboots/syndie -/datum/outfit/admin/modsuit/wizard // Technically not a MODsuit, we'll bundle it up in here for the future when it does become one +/// Technically not a MODsuit, we'll bundle it up in here for the future when it does become one +/datum/outfit/admin/modsuit/wizard name = "Hardsuit - Wizard" suit = /obj/item/clothing/suit/space/hardsuit/wizard shoes = /obj/item/clothing/shoes/magboots/wizard @@ -984,7 +985,8 @@ name = "Tournament Standard Green" uniform = /obj/item/clothing/under/color/green -/datum/outfit/admin/tournament/tournament_gangster //gangster are supposed to fight each other. --rastaf0 +/// gangster are supposed to fight each other. --rastaf0 +/datum/outfit/admin/tournament/tournament_gangster name = "Tournament Gangster" uniform = /obj/item/clothing/under/rank/security/detective @@ -995,7 +997,8 @@ l_pocket = /obj/item/ammo_box/a357 r_hand = /obj/item/gun/projectile/automatic/proto -/datum/outfit/admin/tournament/tournament_chef //Steven Seagal FTW +/// Steven Seagal FTW +/datum/outfit/admin/tournament/tournament_chef name = "Tournament Chef" uniform = /obj/item/clothing/under/rank/civilian/chef diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm index e992aed1af2a..0f5235bf52ca 100644 --- a/code/datums/outfits/outfit_debug.dm +++ b/code/datums/outfits/outfit_debug.dm @@ -49,7 +49,8 @@ name = "AVD-CNED bowman headset" ks2type = /obj/item/encryptionkey/syndicate/all_channels -/obj/item/encryptionkey/syndicate/all_channels // has to be a subtype and stuff +/// has to be a subtype and stuff +/obj/item/encryptionkey/syndicate/all_channels name = "AVD-CNED Encryption Key" desc = "Lets you listen to everything. Use in hand to toggle voice changing. Alt-click to change your fake name." icon_state = "com_cypherkey" diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm index 41adb4a18829..1870faf9ef5d 100644 --- a/code/datums/pipe_datums.dm +++ b/code/datums/pipe_datums.dm @@ -27,7 +27,8 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable pipe_icon = "simple" rpd_dispensable = TRUE -/datum/pipes/atmospheric/bent //Why is this not atmospheric/simple/bent you ask? Because otherwise the ordering of the pipes in the UI menu gets weird +/// Why is this not atmospheric/simple/bent you ask? Because otherwise the ordering of the pipes in the UI menu gets weird +/datum/pipes/atmospheric/bent pipe_name = "bent pipe" pipe_id = PIPE_SIMPLE_BENT orientations = 4 diff --git a/code/datums/position_point_vector.dm b/code/datums/position_point_vector.dm index 1cad3b52899f..433aafeaa189 100644 --- a/code/datums/position_point_vector.dm +++ b/code/datums/position_point_vector.dm @@ -214,7 +214,8 @@ v.increment(multiplier * amount) return v -/datum/point_precise/vector/processed //pixel_speed is per decisecond. +/// pixel_speed is per decisecond. +/datum/point_precise/vector/processed var/last_process = 0 var/last_move = 0 var/paused = FALSE diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm index 6d00e58ba678..ac39f6b03872 100644 --- a/code/datums/spells/bloodcrawl.dm +++ b/code/datums/spells/bloodcrawl.dm @@ -55,7 +55,8 @@ icon = 'icons/effects/blood.dmi' flags = NODROP|ABSTRACT -/obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow +/// Can't use the wizard one, blocked by jaunt/slow +/obj/effect/dummy/slaughter name = "odd blood" icon = 'icons/effects/effects.dmi' icon_state = "nothing" diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index ab1d191f658a..380c178688c6 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -57,7 +57,8 @@ return what_conjure_summoned -/obj/effect/proc_holder/spell/aoe/conjure/summonEdSwarm //test purposes +/// test purposes +/obj/effect/proc_holder/spell/aoe/conjure/summonEdSwarm name = "Dispense Wizard Justice" desc = "This spell dispenses wizard justice." summon_type = list(/mob/living/simple_animal/bot/ed209) diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm index b7fe668761d9..15c1481c8fef 100644 --- a/code/datums/spells/mimic.dm +++ b/code/datums/spells/mimic.dm @@ -19,7 +19,7 @@ var/perfect_disguise = FALSE var/static/list/black_listed_form_types = list( - /obj/screen, + /atom/movable/screen, /obj/singularity, /obj/effect, /mob/living/simple_animal/hostile/megafauna, diff --git a/code/datums/station_traits/postive_traits.dm b/code/datums/station_traits/postive_traits.dm index 963d4291e3c7..6b161fa86625 100644 --- a/code/datums/station_traits/postive_traits.dm +++ b/code/datums/station_traits/postive_traits.dm @@ -154,7 +154,8 @@ implant_to_give.implant(spawned, spawned, TRUE, TRUE) -/datum/station_trait/cybernetic_revolution //NOTE: THIS MAKES EMP MUCH MORE EXPENSIVE. +/// NOTE: THIS MAKES EMP MUCH MORE EXPENSIVE. +/datum/station_trait/cybernetic_revolution name = "Cybernetic Revolution" trait_type = STATION_TRAIT_POSITIVE show_in_report = TRUE diff --git a/code/datums/status_effects/blob_burst.dm b/code/datums/status_effects/blob_burst.dm index 37170782b93b..d1381612a2c4 100644 --- a/code/datums/status_effects/blob_burst.dm +++ b/code/datums/status_effects/blob_burst.dm @@ -1,5 +1,5 @@ /datum/status_effect/blob_burst - alert_type = /obj/screen/alert/status_effect/blob_burst + alert_type = /atom/movable/screen/alert/status_effect/blob_burst var/datum/callback/blob_burst_callback /datum/status_effect/blob_burst/on_creation(mob/living/new_owner, duration = 120 SECONDS, datum/callback/burst_callback) @@ -20,7 +20,7 @@ /datum/status_effect/blob_burst/on_timeout() blob_burst_callback.Invoke() -/obj/screen/alert/status_effect/blob_burst +/atom/movable/screen/alert/status_effect/blob_burst name = "Blob burst" desc = "You're about to burst into a blob, be sure to find a safe place before that you burst!" icon = 'icons/mob/blob.dmi' diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 61143bc0ccaf..7210c6a9cb55 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -4,18 +4,18 @@ id = "his_grace" duration = -1 tick_interval = 4 - alert_type = /obj/screen/alert/status_effect/his_grace + alert_type = /atom/movable/screen/alert/status_effect/his_grace var/bloodlust = 0 /// Attached His Grace toolbox var/obj/item/his_grace/toolbox -/obj/screen/alert/status_effect/his_grace +/atom/movable/screen/alert/status_effect/his_grace name = "His Grace" desc = "His Grace hungers, and you must feed Him." icon_state = "his_grace" alerttooltipstyle = "hisgrace" -/obj/screen/alert/status_effect/his_grace/MouseEntered(location, control, params) +/atom/movable/screen/alert/status_effect/his_grace/MouseEntered(location, control, params) desc = initial(desc) var/datum/status_effect/his_grace/HG = attached_effect desc += "
Current Bloodthirst: [HG.bloodlust]\ @@ -61,9 +61,9 @@ /datum/status_effect/shadow_mend id = "shadow_mend" duration = 3 SECONDS - alert_type = /obj/screen/alert/status_effect/shadow_mend + alert_type = /atom/movable/screen/alert/status_effect/shadow_mend -/obj/screen/alert/status_effect/shadow_mend +/atom/movable/screen/alert/status_effect/shadow_mend name = "Shadow Mend" desc = "Shadowy energies wrap around your wounds, sealing them at a price. After healing, you will slowly lose health every three seconds for thirty seconds." icon_state = "shadow_mend" @@ -88,10 +88,10 @@ duration = 30 SECONDS tick_interval = 3 SECONDS status_type = STATUS_EFFECT_REFRESH - alert_type = /obj/screen/alert/status_effect/void_price + alert_type = /atom/movable/screen/alert/status_effect/void_price var/price = 3 //This is how much hp you lose per tick. Each time the buff is refreshed, it increased by 1. Healing too much in a short period of time will cause your swift demise -/obj/screen/alert/status_effect/void_price +/atom/movable/screen/alert/status_effect/void_price name = "Void Price" desc = "Black tendrils cinch tightly against you, digging wicked barbs into your flesh." icon_state = "shadow_mend" @@ -108,10 +108,10 @@ id = "blooddrunk" duration = 10 tick_interval = 0 - alert_type = /obj/screen/alert/status_effect/blooddrunk + alert_type = /atom/movable/screen/alert/status_effect/blooddrunk var/blooddrunk_damage_mod_remove = 4 // Damage is multiplied by this at the end of the status effect. Modify this one, it changes the _add -/obj/screen/alert/status_effect/blooddrunk +/atom/movable/screen/alert/status_effect/blooddrunk name = "Blood-Drunk" desc = "You are drunk on blood! Your pulse thunders in your ears! Nothing can harm you!" //not true, and the item description mentions its actual effect icon_state = "blooddrunk" @@ -147,7 +147,7 @@ if(islist(owner.stun_absorption) && owner.stun_absorption["blooddrunk"]) owner.remove_stun_absorption("blooddrunk") -/obj/screen/alert/status_effect/dash +/atom/movable/screen/alert/status_effect/dash name = "Dash" desc = "Your have the ability to dash!" icon = 'icons/mob/actions/actions.dmi' @@ -157,16 +157,16 @@ id = "dash" duration = 5 SECONDS tick_interval = 0 - alert_type = /obj/screen/alert/status_effect/dash + alert_type = /atom/movable/screen/alert/status_effect/dash /datum/status_effect/bloodswell id = "bloodswell" duration = 30 SECONDS tick_interval = 0 - alert_type = /obj/screen/alert/status_effect/blood_swell + alert_type = /atom/movable/screen/alert/status_effect/blood_swell var/bonus_damage_applied = FALSE -/obj/screen/alert/status_effect/blood_swell +/atom/movable/screen/alert/status_effect/blood_swell name = "Blood Swell" desc = "Your body has been infused with crimson magics, your resistance to attacks has greatly increased!" icon = 'icons/mob/actions/actions.dmi' @@ -206,9 +206,9 @@ id = "vampire_gladiator" duration = 30 SECONDS tick_interval = 1 SECONDS - alert_type = /obj/screen/alert/status_effect/vampire_gladiator + alert_type = /atom/movable/screen/alert/status_effect/vampire_gladiator -/obj/screen/alert/status_effect/vampire_gladiator +/atom/movable/screen/alert/status_effect/vampire_gladiator name = "Gladiatorial Resilience" desc = "Roused by the thrill of the fight, your body has become more resistant to breaking!" icon = 'icons/mob/actions/actions.dmi' @@ -408,7 +408,7 @@ if(!heal_points) return -/obj/screen/alert/status_effect/regenerative_core +/atom/movable/screen/alert/status_effect/regenerative_core name = "Reinforcing Tendrils" desc = "You can move faster than your broken body could normally handle!" icon_state = "regenerative_core" @@ -418,7 +418,7 @@ id = "Regenerative Core" duration = 1 MINUTES status_type = STATUS_EFFECT_REPLACE - alert_type = /obj/screen/alert/status_effect/regenerative_core + alert_type = /atom/movable/screen/alert/status_effect/regenerative_core /datum/status_effect/regenerative_core/on_apply() ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, id) @@ -551,9 +551,9 @@ id = "chainsaw_slaying" duration = 5 SECONDS status_type = STATUS_EFFECT_REFRESH - alert_type = /obj/screen/alert/status_effect/chainsaw + alert_type = /atom/movable/screen/alert/status_effect/chainsaw -/obj/screen/alert/status_effect/chainsaw +/atom/movable/screen/alert/status_effect/chainsaw name = "Revved up!" desc = "... guts, huge guts! Kill them... must kill them all!" icon_state = "chainsaw" @@ -585,9 +585,9 @@ duration = -1 tick_interval = 2 SECONDS status_type = STATUS_EFFECT_UNIQUE - alert_type = /obj/screen/alert/status_effect/hope + alert_type = /atom/movable/screen/alert/status_effect/hope -/obj/screen/alert/status_effect/hope +/atom/movable/screen/alert/status_effect/hope name = "Hope." desc = "A ray of hope beyond dispair." icon_state = "hope" @@ -640,13 +640,13 @@ return ..() /datum/status_effect/drill_payback/on_apply() - owner.overlay_fullscreen("payback", /obj/screen/fullscreen/payback, 0) + owner.overlay_fullscreen("payback", /atom/movable/screen/fullscreen/payback, 0) addtimer(CALLBACK(src, PROC_REF(payback_phase_2)), 2.7 SECONDS) return TRUE /datum/status_effect/drill_payback/proc/payback_phase_2() owner.clear_fullscreen("payback") - owner.overlay_fullscreen("payback", /obj/screen/fullscreen/payback, 1) + owner.overlay_fullscreen("payback", /atom/movable/screen/fullscreen/payback, 1) /datum/status_effect/drill_payback/tick() //They are not staying down. This will be a fight. if(!drilled_successfully && (get_dist(owner, drilled) >= 9)) //We don't want someone drilling the safe at arivals then raiding bridge with the buff @@ -752,9 +752,9 @@ id = "bearserker rage" duration = 5 SECONDS status_type = STATUS_EFFECT_REFRESH - alert_type = /obj/screen/alert/status_effect/bearserker_rage + alert_type = /atom/movable/screen/alert/status_effect/bearserker_rage -/obj/screen/alert/status_effect/bearserker_rage +/atom/movable/screen/alert/status_effect/bearserker_rage name = "Bearserker Rage" desc = "Blood flows between your fingers, and Foh'Sie roars; \"MORE BLOOD!\"" icon_state = "bearserker" diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 2a2b60997626..efcc3c3ab286 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1,12 +1,13 @@ //OTHER DEBUFFS -/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace +/// does minor damage over time unless holding His Grace +/datum/status_effect/his_wrath id = "his_wrath" duration = -1 tick_interval = 4 - alert_type = /obj/screen/alert/status_effect/his_wrath + alert_type = /atom/movable/screen/alert/status_effect/his_wrath -/obj/screen/alert/status_effect/his_wrath +/atom/movable/screen/alert/status_effect/his_wrath name = "His Wrath" desc = "You fled from His Grace instead of feeding Him, and now you suffer." icon_state = "his_grace" @@ -23,7 +24,8 @@ owner.adjustFireLoss(0.1) owner.adjustToxLoss(0.2) -/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes, can see ghosts and dies if too far from summoner +/// is a cult ghost and can't use manifest runes, can see ghosts and dies if too far from summoner +/datum/status_effect/cultghost id = "cult_ghost" duration = -1 alert_type = null @@ -186,10 +188,10 @@ id = "teleportation sickness" duration = 30 SECONDS status_type = STATUS_EFFECT_REFRESH - alert_type = /obj/screen/alert/status_effect/teleport_sickness + alert_type = /atom/movable/screen/alert/status_effect/teleport_sickness var/teleports = 1 -/obj/screen/alert/status_effect/teleport_sickness +/atom/movable/screen/alert/status_effect/teleport_sickness name = "Teleportation sickness" desc = "You feel like you are going to throw up with all this teleporting." icon_state = "bluespace" @@ -382,6 +384,26 @@ /datum/status_effect/transient/drowsiness/calc_decay() return (-0.2 + (IS_HORIZONTAL(owner) ? -0.8 : 0)) SECONDS +/datum/status_effect/pepper_spray + id = "pepperspray" + duration = 10 SECONDS + status_type = STATUS_EFFECT_REFRESH + tick_interval = -1 + alert_type = null + +/datum/status_effect/pepper_spray/on_apply() + . = ..() + to_chat(owner, "Your throat burns!") + owner.AdjustConfused(12 SECONDS) + owner.Slowed(4 SECONDS) + owner.apply_damage(40, STAMINA) + +/datum/status_effect/pepper_spray/refresh() + . = ..() + owner.AdjustConfused(12 SECONDS) + owner.Slowed(4 SECONDS) + owner.apply_damage(20, STAMINA) + /** * # Drukenness * @@ -442,7 +464,7 @@ owner.Slur(actual_strength) if(!alert_thrown) alert_thrown = TRUE - owner.throw_alert("drunk", /obj/screen/alert/drunk) + owner.throw_alert("drunk", /atom/movable/screen/alert/drunk) owner.sound_environment_override = SOUND_ENVIRONMENT_PSYCHOTIC // THRESHOLD_BRAWLING (60 SECONDS) if(M) @@ -679,7 +701,8 @@ . = ..() REMOVE_TRAIT(owner, TRAIT_MUTE, id) -/datum/status_effect/transient/silence/absolute // this one will mute all emote sounds including gasps +/// this one will mute all emote sounds including gasps +/datum/status_effect/transient/silence/absolute id = "abssilenced" /datum/status_effect/transient/deaf @@ -988,7 +1011,7 @@ /datum/status_effect/bubblegum_curse id = "bubblegum curse" - alert_type = /obj/screen/alert/status_effect/bubblegum_curse + alert_type = /atom/movable/screen/alert/status_effect/bubblegum_curse duration = -1 //Kill it. There is no other option. tick_interval = 1 SECONDS /// The damage the status effect does per tick. @@ -1000,7 +1023,7 @@ /datum/status_effect/bubblegum_curse/on_creation(mob/living/new_owner, mob/living/source) . = ..() source_UID = source.UID() - owner.overlay_fullscreen("Bubblegum", /obj/screen/fullscreen/fog, 1) + owner.overlay_fullscreen("Bubblegum", /atom/movable/screen/fullscreen/fog, 1) /datum/status_effect/bubblegum_curse/tick() var/mob/living/simple_animal/hostile/megafauna/bubblegum/attacker = locateUID(source_UID) @@ -1008,7 +1031,7 @@ qdel(src) if(attacker.health <= attacker.maxHealth / 2) owner.clear_fullscreen("Bubblegum") - owner.overlay_fullscreen("Bubblegum", /obj/screen/fullscreen/fog, 2) + owner.overlay_fullscreen("Bubblegum", /atom/movable/screen/fullscreen/fog, 2) if(!coward_checking) if(owner.z != attacker.z) addtimer(CALLBACK(src, PROC_REF(onstation_coward_callback)), 12 SECONDS) @@ -1100,20 +1123,20 @@ playsound(targetturf, 'sound/misc/exit_blood.ogg', 100, TRUE, -1) addtimer(CALLBACK(attacker, TYPE_PROC_REF(/mob/living/simple_animal/hostile/megafauna/bubblegum, FindTarget), list(owner), 1), 2) -/obj/screen/alert/status_effect/bubblegum_curse +/atom/movable/screen/alert/status_effect/bubblegum_curse name = "I SEE YOU" desc = "YOUR SOUL WILL BE MINE FOR YOUR INSOLENCE" icon_state = "bubblegumjumpscare" -/obj/screen/alert/status_effect/bubblegum_curse/Initialize(mapload) +/atom/movable/screen/alert/status_effect/bubblegum_curse/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) -/obj/screen/alert/status_effect/bubblegum_curse/Destroy() +/atom/movable/screen/alert/status_effect/bubblegum_curse/Destroy() STOP_PROCESSING(SSobj, src) return ..() -/obj/screen/alert/status_effect/bubblegum_curse/process() +/atom/movable/screen/alert/status_effect/bubblegum_curse/process() var/new_filter = isnull(get_filter("ray")) ray_filter_helper(1, 40,"#ce3030", 6, 20) if(new_filter) @@ -1123,10 +1146,10 @@ /datum/status_effect/abductor_cooldown id = "abductor_cooldown" - alert_type = /obj/screen/alert/status_effect/abductor_cooldown + alert_type = /atom/movable/screen/alert/status_effect/abductor_cooldown duration = 10 SECONDS -/obj/screen/alert/status_effect/abductor_cooldown +/atom/movable/screen/alert/status_effect/abductor_cooldown name = "Teleportation cooldown" desc = "Per article A-113, all experimentors must wait 10000 milliseconds between teleports in order to ensure no long term genetic or mental damage happens to experimentor or test subjects." icon_state = "bluespace" @@ -1137,7 +1160,7 @@ /// Purposebuilt for cursed slot machines. /datum/status_effect/cursed id = "cursed" - alert_type = /obj/screen/alert/status_effect/cursed + alert_type = /atom/movable/screen/alert/status_effect/cursed /// The max number of curses a target can incur with this status effect. var/max_curse_count = DEFAULT_MAX_CURSE_COUNT /// The amount of times we have been "applied" to the target. @@ -1281,12 +1304,12 @@ oxy = (curse_count * ticked_coefficient), ) -/obj/screen/alert/status_effect/cursed +/atom/movable/screen/alert/status_effect/cursed name = "Cursed!" desc = "The brand on your hand reminds you of your greed, yet you seem to be okay otherwise." icon_state = "cursed_by_slots" -/obj/screen/alert/status_effect/cursed/update_desc() +/atom/movable/screen/alert/status_effect/cursed/update_desc() . = ..() var/datum/status_effect/cursed/linked_effect = attached_effect var/curses = linked_effect.curse_count diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index 653238c6358a..fa1ed6ad2afa 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -2,11 +2,11 @@ id = "frozen" duration = 100 status_type = STATUS_EFFECT_UNIQUE - alert_type = /obj/screen/alert/status_effect/freon + alert_type = /atom/movable/screen/alert/status_effect/freon var/icon/cube var/can_melt = TRUE -/obj/screen/alert/status_effect/freon +/atom/movable/screen/alert/status_effect/freon name = "Frozen Solid" desc = "You're frozen inside an ice cube, and cannot move! You can still do stuff, like shooting. Resist out of the cube!" icon_state = "frozen" diff --git a/code/datums/status_effects/magic_disguise.dm b/code/datums/status_effects/magic_disguise.dm index 9da1fb8dc39b..97a3640de2b3 100644 --- a/code/datums/status_effects/magic_disguise.dm +++ b/code/datums/status_effects/magic_disguise.dm @@ -2,11 +2,11 @@ id = "magic_disguise" duration = -1 tick_interval = -1 - alert_type = /obj/screen/alert/status_effect/magic_disguise + alert_type = /atom/movable/screen/alert/status_effect/magic_disguise status_type = STATUS_EFFECT_REPLACE var/datum/icon_snapshot/disguise -/obj/screen/alert/status_effect/magic_disguise +/atom/movable/screen/alert/status_effect/magic_disguise name = "Disguised" desc = "You are disguised as a crewmember." icon = 'icons/mob/actions/actions.dmi' diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 50ddee96a03e..1a0339564de5 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -1,6 +1,7 @@ //entirely neutral or internal status effects go here -/datum/status_effect/crusher_damage //tracks the damage dealt to this mob by kinetic crushers +/// tracks the damage dealt to this mob by kinetic crushers +/datum/status_effect/crusher_damage id = "crusher_damage" duration = -1 status_type = STATUS_EFFECT_UNIQUE diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm index b137ffe36601..65017ada48bb 100644 --- a/code/datums/status_effects/status_effect.dm +++ b/code/datums/status_effects/status_effect.dm @@ -10,8 +10,8 @@ var/status_type = STATUS_EFFECT_UNIQUE //How many of the effect can be on one mob, and what happens when you try to add another var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves - var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description - var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists + var/alert_type = /atom/movable/screen/alert/status_effect //the alert thrown by the status effect, contains name and description + var/atom/movable/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists /datum/status_effect/New(list/arguments) on_creation(arglist(arguments)) @@ -28,7 +28,7 @@ duration = world.time + duration tick_interval = world.time + tick_interval if(alert_type) - var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type) + var/atom/movable/screen/alert/status_effect/A = owner.throw_alert(id, alert_type) A.attached_effect = src //so the alert can reference us, if it needs to linked_alert = A //so we can reference the alert, if we need to if(duration > 0 || initial(tick_interval) > 0) //don't process if we don't care @@ -89,12 +89,12 @@ // ALERT HOOK // //////////////// -/obj/screen/alert/status_effect +/atom/movable/screen/alert/status_effect name = "Curse of Mundanity" desc = "You don't feel any different..." var/datum/status_effect/attached_effect -/obj/screen/alert/status_effect/Destroy() +/atom/movable/screen/alert/status_effect/Destroy() if(attached_effect) attached_effect.linked_alert = null attached_effect = null diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm index 7f437119a8b2..e13bdf4b7b8e 100644 --- a/code/datums/uplink_items/uplink_traitor.dm +++ b/code/datums/uplink_items/uplink_traitor.dm @@ -476,7 +476,8 @@ surplus = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/stealthy_weapons/combat_minus // Nukies get combat gloves plus instead +/// Nukies get combat gloves plus instead +/datum/uplink_item/stealthy_weapons/combat_minus name = "Experimental Krav Gloves" desc = "Experimental gloves with installed nanochips that teach you Krav Maga when worn, great as a cheap backup weapon. Warning, the nanochips will override any other fighting styles such as CQC. Do not look as fly as the Warden's" reference = "CGM" @@ -484,7 +485,8 @@ cost = 50 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/device_tools/thermal_drill // Nukies get Diamond Tipped Thermal Safe Drill instead +/// Nukies get Diamond Tipped Thermal Safe Drill instead +/datum/uplink_item/device_tools/thermal_drill name = "Amplifying Thermal Safe Drill" desc = "A tungsten carbide thermal drill with magnetic clamps for the purpose of drilling hardened objects. Comes with built in security detection and nanite system, to keep you up if security comes a-knocking." reference = "DRL" @@ -516,7 +518,8 @@ surplus = 60 excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST) -/datum/uplink_item/bio_chips/uplink // Nukies get Nuclear Uplink Bio-chip instead +/// Nukies get Nuclear Uplink Bio-chip instead +/datum/uplink_item/bio_chips/uplink name = "Uplink Bio-chip" desc = "A bio-chip injected into the body, and later activated manually to open an uplink with 50 telecrystals. The ability for an agent to open an uplink after their possessions have been stripped from them makes this implant excellent for escaping confinement." reference = "UI" diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm index e1370070513e..aa4802ffabbc 100644 --- a/code/game/area/areas/mining_areas.dm +++ b/code/game/area/areas/mining_areas.dm @@ -77,7 +77,8 @@ name = "Mining Station Cafeteria" icon_state = "mining_living" -/area/lavaland/surface/outdoors/outpost/catwalk //subtype of /surface so storms hit there +/// subtype of /surface so storms hit there +/area/lavaland/surface/outdoors/outpost/catwalk name = "Mining Station Catwalk" icon_state = "mining" @@ -89,7 +90,8 @@ name = "Mining Station Custodial Storage" icon_state = "janitor" -/area/mine/outpost/engineering // basically engi and atmos combined. I'm keeping it as "engineering" code wise, but "Life Support" sounds cooler in-game +/// basically engi and atmos combined. I'm keeping it as "engineering" code wise, but "Life Support" sounds cooler in-game +/area/mine/outpost/engineering name = "Mining Station Life Support" icon_state = "engi" @@ -184,10 +186,12 @@ name = "Lavaland Wastes" outdoors = TRUE -/area/lavaland/surface/outdoors/unexplored //monsters and ruins spawn here +/// monsters and ruins spawn here +/area/lavaland/surface/outdoors/unexplored icon_state = "unexplored" -/area/lavaland/surface/outdoors/unexplored/danger //megafauna will also spawn here +/// megafauna will also spawn here +/area/lavaland/surface/outdoors/unexplored/danger icon_state = "danger" /area/lavaland/surface/outdoors/explored diff --git a/code/game/area/asteroid_areas.dm b/code/game/area/asteroid_areas.dm index f8fd94b3d092..770be1271998 100644 --- a/code/game/area/asteroid_areas.dm +++ b/code/game/area/asteroid_areas.dm @@ -1,6 +1,7 @@ // Asteroids -/area/asteroid // -- TLE +/// -- TLE +/area/asteroid name = "\improper Asteroid" icon_state = "asteroid" requires_power = FALSE @@ -11,7 +12,8 @@ min_ambience_cooldown = 70 SECONDS max_ambience_cooldown = 220 SECONDS -/area/asteroid/cave // -- TLE +/// -- TLE +/area/asteroid/cave name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = FALSE diff --git a/code/game/area/misc_areas.dm b/code/game/area/misc_areas.dm index 329e031f3903..64595545136a 100644 --- a/code/game/area/misc_areas.dm +++ b/code/game/area/misc_areas.dm @@ -3,7 +3,8 @@ name = "Unknown" icon_state = "storage" -/area/start // will be unused once kurper gets his login interface patch done +/// will be unused once kurper gets his login interface patch done +/area/start name = "start area" icon_state = "start" requires_power = FALSE @@ -29,6 +30,9 @@ /area/space/nearstation/disposals icon_state = "nearspace_disposals" +/area/space/nearstation/centcom + icon_state = "space_near_cc" + /area/space/atmosalert() return diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm index efd45956d8e5..e6f576975cb7 100644 --- a/code/game/area/shuttle_areas.dm +++ b/code/game/area/shuttle_areas.dm @@ -89,7 +89,8 @@ /area/shuttle/escape_pod3/transit icon_state = "shuttle" -/area/shuttle/escape_pod5 //Pod 4 was lost to meteors +/// Pod 4 was lost to meteors +/area/shuttle/escape_pod5 name = "\improper Escape Pod Five" nad_allowed = TRUE diff --git a/code/game/area/ss13_areas/maintenance_areas.dm b/code/game/area/ss13_areas/maintenance_areas.dm index fbd3195e3f60..5cdf15bb5ee3 100644 --- a/code/game/area/ss13_areas/maintenance_areas.dm +++ b/code/game/area/ss13_areas/maintenance_areas.dm @@ -165,7 +165,8 @@ name = "\improper Fore Starboard Solar Maintenance" icon_state = "FSctrl" -/area/station/maintenance/assembly_line //Derelict Assembly Line +/// Derelict Assembly Line +/area/station/maintenance/assembly_line name = "\improper Assembly Line" icon_state = "ass_line" apc_starts_off = TRUE diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index 274916d4937e..20f93ed3f949 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -1,4 +1,5 @@ -/datum/action/innate/cult/blood_magic //Blood magic handles the creation of blood spells (formerly talismans) +/// Blood magic handles the creation of blood spells (formerly talismans) +/datum/action/innate/cult/blood_magic name = "Prepare Blood Magic" button_icon_state = "carve" desc = "Prepare blood magic by carving runes into your flesh. This is easier with an empowering rune." @@ -85,7 +86,8 @@ if(nullify_spell) qdel(nullify_spell) -/datum/action/innate/cult/blood_spell //The next generation of talismans, handles storage/creation of blood magic +/// The next generation of talismans, handles storage/creation of blood magic +/datum/action/innate/cult/blood_spell name = "Blood Magic" button_icon_state = "telerune" desc = "Fear the Old Blood." @@ -379,7 +381,7 @@ // The "magic hand" items /obj/item/melee/blood_magic - name = "\improper magical aura" + name = "magical aura" desc = "A sinister looking aura that distorts the flow of reality around it." icon = 'icons/obj/items.dmi' lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' @@ -608,7 +610,8 @@ to_chat(user, "[C] is already bound.") -/obj/item/restraints/handcuffs/energy/cult //For the shackling spell +/// For the shackling spell +/obj/item/restraints/handcuffs/energy/cult name = "shadow shackles" desc = "Shackles that bind the wrists with sinister magic." trashtype = /obj/item/restraints/handcuffs/energy/used diff --git a/code/game/gamemodes/cult/cult_objectives.dm b/code/game/gamemodes/cult/cult_objectives.dm index fe5816e16541..6afc676e3eeb 100644 --- a/code/game/gamemodes/cult/cult_objectives.dm +++ b/code/game/gamemodes/cult/cult_objectives.dm @@ -1,4 +1,5 @@ -/datum/cult_objectives //Replace with team antag datum objectives from tg once ported +/// Replace with team antag datum objectives from tg once ported +/datum/cult_objectives var/cult_status = NARSIE_IS_ASLEEP var/list/presummon_objs = list() var/datum/objective/eldergod/obj_summon = new @@ -117,7 +118,8 @@ //Objectives -/datum/objective/servecult //Given to cultists on conversion/roundstart +/// Given to cultists on conversion/roundstart +/datum/objective/servecult explanation_text = "Assist your fellow cultists and Tear the Veil! (Use the Study Veil action to check your progress.)" completed = TRUE needs_target = FALSE diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index b8c75eb8bd32..fe9fc6505d87 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -226,7 +226,8 @@ return A -/obj/item/organ/internal/heart/gland/emp //TODO : Replace with something more interesting +/// TODO : Replace with something more interesting +/obj/item/organ/internal/heart/gland/emp origin_tech = "materials=4;biotech=4;magnets=6;abductor=3" cooldown_low = 800 cooldown_high = 1200 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 ae03f1889dac..045203e0e47c 100644 --- a/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm +++ b/code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm @@ -164,7 +164,7 @@ if(lum_count > 0.2) if(!thrown_alert) thrown_alert = TRUE - throw_alert("light", /obj/screen/alert/lightexposure) + throw_alert("light", /atom/movable/screen/alert/lightexposure) alpha = 255 speed = initial(speed) else diff --git a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm index 594ede9117e0..11a5d6500d18 100644 --- a/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm +++ b/code/game/gamemodes/miniantags/demons/slaughter demon/slaughter.dm @@ -86,7 +86,8 @@ health = 170 // Cult slaughter demon -/mob/living/simple_animal/demon/slaughter/cult //Summoned as part of the cult objective "Bring the Slaughter" +/// Summoned as part of the cult objective "Bring the Slaughter" +/mob/living/simple_animal/demon/slaughter/cult name = "harbinger of the slaughter" real_name = "harbinger of the Slaughter" desc = "An awful creature from beyond the realms of madness." diff --git a/code/game/gamemodes/miniantags/guardian/types/assassin.dm b/code/game/gamemodes/miniantags/guardian/types/assassin.dm index 33263f8fb5a8..1e12643a117a 100644 --- a/code/game/gamemodes/miniantags/guardian/types/assassin.dm +++ b/code/game/gamemodes/miniantags/guardian/types/assassin.dm @@ -12,8 +12,8 @@ var/toggle = FALSE var/stealthcooldown = 0 var/default_stealth_cooldown = 10 SECONDS - var/obj/screen/alert/canstealthalert - var/obj/screen/alert/instealthalert + var/atom/movable/screen/alert/canstealthalert + var/atom/movable/screen/alert/instealthalert /mob/living/simple_animal/hostile/guardian/assassin/Initialize(mapload, mob/living/host) . = ..() @@ -88,12 +88,12 @@ if(stealthcooldown <= world.time) if(toggle) if(!instealthalert) - instealthalert = throw_alert("instealth", /obj/screen/alert/instealth) + instealthalert = throw_alert("instealth", /atom/movable/screen/alert/instealth) clear_alert("canstealth") canstealthalert = null else if(!canstealthalert) - canstealthalert = throw_alert("canstealth", /obj/screen/alert/canstealth) + canstealthalert = throw_alert("canstealth", /atom/movable/screen/alert/canstealth) clear_alert("instealth") instealthalert = null else diff --git a/code/game/gamemodes/miniantags/guardian/types/charger.dm b/code/game/gamemodes/miniantags/guardian/types/charger.dm index 4e293a639d27..fd5ae62d462a 100644 --- a/code/game/gamemodes/miniantags/guardian/types/charger.dm +++ b/code/game/gamemodes/miniantags/guardian/types/charger.dm @@ -11,13 +11,13 @@ tech_fluff_string = "Boot sequence complete. Charge modules loaded. Holoparasite swarm online." bio_fluff_string = "Your scarab swarm finishes mutating and stirs to life, ready to deal damage." var/charging = FALSE - var/obj/screen/alert/chargealert + var/atom/movable/screen/alert/chargealert /mob/living/simple_animal/hostile/guardian/charger/Life() . = ..() if(ranged_cooldown <= world.time) if(!chargealert) - chargealert = throw_alert("charge", /obj/screen/alert/cancharge) + chargealert = throw_alert("charge", /atom/movable/screen/alert/cancharge) else clear_alert("charge") chargealert = null diff --git a/code/game/gamemodes/miniantags/morph/spells/ambush.dm b/code/game/gamemodes/miniantags/morph/spells/ambush.dm index 2713a05beb05..36da7da9f922 100644 --- a/code/game/gamemodes/miniantags/morph/spells/ambush.dm +++ b/code/game/gamemodes/miniantags/morph/spells/ambush.dm @@ -40,7 +40,7 @@ id = "morph_ambush" duration = -1 tick_interval = MORPH_AMBUSH_PERFECTION_TIME - alert_type = /obj/screen/alert/status_effect/morph_ambush + alert_type = /atom/movable/screen/alert/status_effect/morph_ambush /datum/status_effect/morph_ambush/tick() STOP_PROCESSING(SSfastprocess, src) @@ -49,7 +49,7 @@ linked_alert.name = "Perfect Ambush!" linked_alert.desc = "You have prepared an ambush! Your disguise is flawless!" -/obj/screen/alert/status_effect/morph_ambush +/atom/movable/screen/alert/status_effect/morph_ambush name = "Ambush!" desc = "You have prepared an ambush!" icon_state = "morph_ambush" diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm index 155cb343461f..b56ff3677864 100644 --- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm +++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm @@ -502,7 +502,7 @@ // 2 * initial_rate - upgrade_level rate += initial(health_loss_rate) adjustHealth(rate) - throw_alert(ALERT_CATEGORY_NOPOWER, /obj/screen/alert/pulse_nopower) + throw_alert(ALERT_CATEGORY_NOPOWER, /atom/movable/screen/alert/pulse_nopower) if(regen_lock > 0) if(--regen_lock == 0) @@ -704,7 +704,7 @@ return visible_message("[src] [pick("fizzles", "wails", "flails")] in anguish!") playsound(get_turf(src), pick(hurt_sounds), 30, TRUE) - throw_alert(ALERT_CATEGORY_NOREGEN, /obj/screen/alert/pulse_noregen) + throw_alert(ALERT_CATEGORY_NOREGEN, /atom/movable/screen/alert/pulse_noregen) switch(severity) if(EMP_LIGHT) adjustHealth(round(max(initial(health) / 4, round(maxHealth / 8)))) @@ -843,12 +843,12 @@ cell_location.update_icon() //update power meters and such cell_to_charge.update_icon() -/obj/screen/alert/pulse_nopower +/atom/movable/screen/alert/pulse_nopower name = "No Power" desc = "You are not connected to a cable or machine and are losing health!" icon_state = "pd_nopower" -/obj/screen/alert/pulse_noregen +/atom/movable/screen/alert/pulse_noregen name = "Regeneration Stalled" desc = "You've been EMP'd and cannot regenerate health!" icon_state = "pd_noregen" diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index a5f4d6827967..2e846c43f6a5 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -227,10 +227,7 @@ sleep(0.1) alpha = i visible_message("[src]'s body breaks apart into a fine pile of blue dust.") - var/obj/item/ectoplasm/revenant/R = new (get_turf(src)) - var/reforming_essence = essence_regen_cap //retain the gained essence capacity - R.essence = max(reforming_essence - 15 * perfectsouls, 75) //minus any perfect souls - R.client_to_revive = src.client //If the essence reforms, the old revenant is put back in the body + new /obj/item/ectoplasm/revenant(get_turf(src)) ghostize() qdel(src) @@ -362,83 +359,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "revenantEctoplasm" w_class = WEIGHT_CLASS_SMALL - var/reforming = 1 - var/essence = 75 //the maximum essence of the reforming revenant - var/inert = 0 - var/client/client_to_revive - -/obj/item/ectoplasm/revenant/New() - ..() - reforming = 0 - spawn(600) //1 minutes - if(src && reforming) - reform() - else - inert = 1 - visible_message("[src] settles down and seems lifeless.") - -/obj/item/ectoplasm/revenant/attack_self(mob/user) - if(!reforming || inert) - return ..() - user.visible_message("[user] scatters [src] in all directions.", \ - "You scatter [src] across the area. The particles slowly fade away.") - user.drop_item() - qdel(src) - -/obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom) - ..() - if(inert) - return - visible_message("[src] breaks into particles upon impact, which fade away to nothingness.") - qdel(src) /obj/item/ectoplasm/revenant/examine(mob/user) . = ..() - if(inert) - . += "It seems inert." - else if(reforming) - . += "It is shifting and distorted. It would be wise to destroy this." - -/obj/item/ectoplasm/revenant/proc/reform() // Unused proc, production doesn't have revenants revive - if(inert || !src) - return - var/key_of_revenant - message_admins("Revenant ectoplasm was left undestroyed for 1 minute and is reforming into a new revenant.") - loc = get_turf(src) //In case it's in a backpack or someone's hand - var/mob/living/simple_animal/revenant/R = new(get_turf(src)) - if(client_to_revive) - for(var/mob/M in GLOB.dead_mob_list) - if(M.client == client_to_revive) //Only recreates the mob if the mob the client is in is dead - R.client = client_to_revive - key_of_revenant = client_to_revive.key - - spawn() - if(!key_of_revenant) - message_admins("The new revenant's old client either could not be found or is in a new, living mob - grabbing a random candidate instead...") - var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a revenant?", ROLE_REVENANT, TRUE, source = /mob/living/simple_animal/revenant) - if(!candidates.len) - qdel(R) - message_admins("No candidates were found for the new revenant. Oh well!") - inert = 1 - visible_message("[src] settles down and seems lifeless.") - return - var/mob/C = pick(candidates) - key_of_revenant = C.key - if(!key_of_revenant) - qdel(R) - message_admins("No ckey was found for the new revenant. Oh well!") - inert = 1 - visible_message("[src] settles down and seems lifeless.") - return - var/datum/mind/player_mind = new /datum/mind(key_of_revenant) - player_mind.active = TRUE - player_mind.transfer_to(R) - player_mind.assigned_role = SPECIAL_ROLE_REVENANT - player_mind.special_role = SPECIAL_ROLE_REVENANT - SSticker.mode.traitors |= player_mind - message_admins("[key_of_revenant] has been [client_to_revive ? "re":""]made into a revenant by reforming ectoplasm.") - log_game("[key_of_revenant] was [client_to_revive ? "re":""]made as a revenant by reforming ectoplasm.") - visible_message("[src] suddenly rises into the air before fading away.") - qdel(src) - if(src) //Should never happen, but just in case - inert = 1 + . += "Lifeless ectoplasm, still faintly glimmering in the light. From what was once a spirit seeking revenge on the station." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index d340f8d8cadc..047099f1baa6 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -266,7 +266,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return TRUE -/datum/objective/debrain //I want braaaainssss +/// I want braaaainssss +/datum/objective/debrain name = "Debrain" martyr_compatible = FALSE @@ -297,7 +298,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return FALSE -/datum/objective/protect //The opposite of killing a dude. +/// The opposite of killing a dude. +/datum/objective/protect name = "Protect" martyr_compatible = TRUE @@ -318,7 +320,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) return TRUE return FALSE -/datum/objective/protect/mindslave //subytpe for mindslave implants +/// subytpe for mindslave implants +/datum/objective/protect/mindslave needs_target = FALSE // To be clear, this objective should have a target, but it will always be manually set to the mindslaver through the mindslave antag datum. // This objective should only be given to a single owner. We can use `owner` and not `get_owners()`. diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index bf3eadd6551f..297d085e66d4 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -702,7 +702,8 @@ GLOBAL_LIST_EMPTY(multiverse) /obj/item/multisword/pure_evil probability_evil = 100 -/obj/item/multisword/pike //If We are to be used and spent, let it be for a noble purpose. +/// If We are to be used and spent, let it be for a noble purpose. +/obj/item/multisword/pike name = "phantom pike" desc = "A fishing pike that appears to be imbued with a peculiar energy." icon = 'icons/obj/items.dmi' diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 0f0dfbe4f5df..fb6afac4da1e 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -1,5 +1,5 @@ /obj/item/melee/touch_attack - name = "\improper outstretched hand" + name = "outstretched hand" desc = "High Five?" var/catchphrase = "High Five!" var/on_use_sound = null diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 74b672babc58..e983c7ed57fc 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -144,7 +144,7 @@ SEND_SOUND(player_client, sound('sound/misc/notice2.ogg')) window_flash(player_client) - var/obj/screen/alert/notify_soulstone/A = player_mob.throw_alert("\ref[src]_soulstone_thingy", /obj/screen/alert/notify_soulstone) + var/atom/movable/screen/alert/notify_soulstone/A = player_mob.throw_alert("\ref[src]_soulstone_thingy", /atom/movable/screen/alert/notify_soulstone) if(player_client.prefs && player_client.prefs.UI_style) A.icon = ui_style2icon(player_client.prefs.UI_style) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index a38bde82f0c2..3015fcaf27e1 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -81,7 +81,8 @@ mycomputer.mybeacon = null return ..() -/obj/machinery/bluespace_beacon/syndicate/infiltrator //beacon guaranteed offline at roundstart for infiltrator base +/// beacon guaranteed offline at roundstart for infiltrator base +/obj/machinery/bluespace_beacon/syndicate/infiltrator cc_beacon = TRUE /obj/machinery/bluespace_beacon/syndicate/infiltrator/Initialize(mapload) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 54350fd29a27..6434516c7ee6 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -390,7 +390,7 @@ /obj/machinery/camera/get_remote_view_fullscreens(mob/user) if(view_range == short_range) //unfocused - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2) /obj/machinery/camera/update_remote_sight(mob/living/user) if(isXRay() && isAI(user)) @@ -405,7 +405,8 @@ ..() return TRUE -/obj/machinery/camera/portable //Cameras which are placed inside of things, such as helmets. +/// Cameras which are placed inside of things, such as helmets. +/obj/machinery/camera/portable start_active = TRUE // theres no real way to reactivate these, so never break them when they init var/turf/prev_turf diff --git a/code/game/machinery/computer/arcade_games/recruiter.dm b/code/game/machinery/computer/arcade_games/recruiter.dm index 5e64517a629b..717d798d02fc 100644 --- a/code/game/machinery/computer/arcade_games/recruiter.dm +++ b/code/game/machinery/computer/arcade_games/recruiter.dm @@ -20,7 +20,7 @@ light_color = LIGHT_COLOR_WHITE circuit = /obj/item/circuitboard/arcade/recruiter var/candidate_name - var/candidate_gender + var/candidate_birth var/age var/datum/species/cand_species var/planet_of_origin @@ -53,9 +53,9 @@ "Awarded the medal of service for outstanding work in botany", "Hacked into the Head of Personnel's office to save Ian", "Has proven knowledge of SOP, but no working experience", "Has worked at Mr Changs", "Spent 2 years as a freelance journalist", "Known as a hero for keeping stations clean during attacks", - "Worked as a bureaucrat for SolGov", "Worked in Donk Corporation's R&D department", + "Worked as a bureaucrat for SolGov", "Worked in Donk Corporation's toy R&D department", "Did work for USSP as an translator", "Took care of Toxins, Xenobiology, Robotics and R&D as a single worker in the Research department", - "Served for 4 years as a soldier of the Prospero Order", "Traveled through various systems as a businessman", + "Did maintenance on multiple cybernetic limbs over Biotech Solutions", "Traveled through various systems as a businessman", "Worked as a waiter for one year", "Has previous experience as a cameraman", "Spent years of their life being a janitor at Clown College", "Was given numerous good reviews for delivering cargo requests on time", "Helped old people cross the holostreet", "Has proven ability to read", "Served 4 years in NT navy", @@ -68,7 +68,9 @@ "Has received several commendations due to visually appealing kitchen remodelings", "Is known to report any petty Space Law or SOP breakage to the relevant authorities", "As Chef, adapted their menus in order to appeal all stationed species", "Was part of the \"Pump Purgers\", famous for the streak of 102 shifts with no Supermatter Explosions", - "Virologist; took it upon themselves to distribute a vaccine to the crew", "Conducted experiments that generated high profits but many casualties") + "Virologist; took it upon themselves to distribute a vaccine to the crew", "Conducted experiments that generated high profits but many casualties", + "Did multiple cargo transport jobs for the Port Royal Inc", "Been a test pilot for the new Einstein Engines Inc prototype engines", + "Manufactured multiple energy guns at Shellguard Munitions", "Spent years cleaning Aussec Armory guns") var/list/incorrect_records = list("Caught littering on the NSS Cyberiad", "Scientist involved in the ###### incident", "Rescued four assistants from a plasma fire, but left behind the station blueprints", @@ -105,24 +107,25 @@ else cand_species = pick(hirable_species) - candidate_gender = pick(MALE, FEMALE, NEUTER) // Gender - - if(candidate_gender == NEUTER && initial(cand_species.has_gender)) // If the species has a gender it cannot be neuter! - good_candidate = FALSE - if(prob(PROB_CANDIDATE_ERRORS)) // Age age = pick(initial(cand_species.max_age) + rand(20, 100), (initial(cand_species.min_age) - rand(1, 7))) // Its either too young or too old for the job good_candidate = FALSE else age = rand(initial(cand_species.min_age), initial(cand_species.max_age)) + if(prob(PROB_CANDIDATE_ERRORS)) // Date of birth + candidate_birth = "[rand(1, 12)]/[GLOB.game_year - age + pick(-400, -300, -200, -100, 50, 100, 150)]" // The age doesn't match with the date of birth + good_candidate = FALSE + else + candidate_birth = "[rand(1, 12)]/[GLOB.game_year - age]" + if(prob(PROB_CANDIDATE_ERRORS)) // Name // Lets pick all species with a naming scheme and remove the selected one so we can have a mismatch var/datum/species/wrong_species = pick((hirable_species + /datum/species/monkey + /datum/species/golem - cand_species)) - candidate_name = random_name(candidate_gender, initial(wrong_species.name)) + candidate_name = random_name(species = initial(wrong_species.name)) good_candidate = FALSE else - candidate_name = random_name(candidate_gender, initial(cand_species.name)) + candidate_name = random_name(species = initial(cand_species.name)) if(prob(PROB_CANDIDATE_ERRORS)) // Planet planet_of_origin = pick(incorrect_planets) @@ -150,31 +153,31 @@ switch(unique_candidate) if(UNIQUE_STEVE) // Steve is special candidate_name = "Steve" - candidate_gender = MALE age = "30" + candidate_birth = "12/[GLOB.game_year - 30]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Central Command Intern" employment_records = "Experience in pressing buttons" if(UNIQUE_MIME) // Only hire mimes that don't fill their employment application candidate_name = "..." - candidate_gender = "..." + candidate_birth = "..." age = "..." planet_of_origin = "..." job_requested = "Mime" employment_records = "..." if(UNIQUE_CEO_CHILD) // Hes the son of the CEO, what do you expect? candidate_name = "Johnny Nanotrasen, Jr." - candidate_gender = MALE age = "12" + candidate_birth = "1/[GLOB.game_year - 12]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Captain" employment_records = "Whatever" if(UNIQUE_VIGILANTE) // For some reason vigilantes do get inside NT stations, let them slip in candidate_name = "Owlman" - candidate_gender = MALE age = "38" + candidate_birth = "6/[GLOB.game_year - 38]" cand_species = /datum/species/human planet_of_origin = "Unknown" job_requested = "Assistant" @@ -204,7 +207,7 @@ "gamestatus" = game_status, "cand_name" = candidate_name, - "cand_gender" = capitalize(candidate_gender), + "cand_birth" = candidate_birth, "cand_age" = age, "cand_species" = initial(cand_species.name), "cand_planet" = planet_of_origin, diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm index 56926511eb10..18b0185f72be 100644 --- a/code/game/machinery/computer/atmos_controllers.dm +++ b/code/game/machinery/computer/atmos_controllers.dm @@ -495,7 +495,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) // Central atmos control // /obj/machinery/computer/atmoscontrol - name = "\improper central atmospherics computer" + name = "central atmospherics computer" icon = 'icons/obj/computer.dmi' icon_keyboard = "atmos_key" icon_screen = "tank" diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 792ce397af4e..bd648b911026 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -206,9 +206,9 @@ var/obj/machinery/camera/final = T[camera] playsound(origin, "terminal_type", 25, 0) if(final) - playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0) + playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, FALSE) remote_eye.setLoc(get_turf(final)) - C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/noise) + C.overlay_fullscreen("flash", /atom/movable/screen/fullscreen/flash/noise) C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console! else - playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0) + playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, FALSE) diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index 18cf4997b358..046d2445b448 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -15,10 +15,10 @@ // Stuff needed to render the map var/map_name var/const/default_map_size = 15 - var/obj/screen/map_view/cam_screen + var/atom/movable/screen/map_view/cam_screen /// All the plane masters that need to be applied. var/list/cam_plane_masters - var/obj/screen/background/cam_background + var/atom/movable/screen/background/cam_background // Parent object this camera is assigned to. Used for camera bugs var/atom/movable/parent @@ -39,8 +39,8 @@ cam_screen.del_on_map_removal = FALSE cam_screen.screen_loc = "[map_name]:1,1" cam_plane_masters = list() - for(var/plane in subtypesof(/obj/screen/plane_master)) - var/obj/screen/instance = new plane() + for(var/plane in subtypesof(/atom/movable/screen/plane_master)) + var/atom/movable/screen/instance = new plane() instance.assigned_map = map_name instance.del_on_map_removal = FALSE instance.screen_loc = "[map_name]:CENTER" diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 39e01428a41e..211400fcef2d 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -94,10 +94,10 @@ /// pushes an alert to the AI and its borgs about the law changes /obj/machinery/computer/aiupload/proc/alert_silicons() current.show_laws() - current.throw_alert("newlaw", /obj/screen/alert/newlaw) + current.throw_alert("newlaw", /atom/movable/screen/alert/newlaw) for(var/mob/living/silicon/robot/borg in current.connected_robots) borg.cmd_show_laws() - borg.throw_alert("newlaw", /obj/screen/alert/newlaw) + borg.throw_alert("newlaw", /atom/movable/screen/alert/newlaw) /obj/machinery/computer/aiupload/attack_hand(mob/user) if(stat & NOPOWER) diff --git a/code/game/machinery/computer/medical_records.dm b/code/game/machinery/computer/medical_records.dm index 521925639715..f9e35d1fcb1f 100644 --- a/code/game/machinery/computer/medical_records.dm +++ b/code/game/machinery/computer/medical_records.dm @@ -7,7 +7,8 @@ #define FIELD(N, V, E) list(field = N, value = V, edit = E) #define MED_FIELD(N, V, E, LB) list(field = N, value = V, edit = E, line_break = LB) -/obj/machinery/computer/med_data //TODO:SANITY +/// TODO:SANITY +/obj/machinery/computer/med_data name = "medical records console" desc = "This can be used to check medical records." icon_keyboard = "med_key" diff --git a/code/game/machinery/computer/power_monitor_console.dm b/code/game/machinery/computer/power_monitor_console.dm index 1d9d6be8cf5c..d257ca45704d 100644 --- a/code/game/machinery/computer/power_monitor_console.dm +++ b/code/game/machinery/computer/power_monitor_console.dm @@ -24,7 +24,8 @@ /// The history list itself of the power var/list/history = list() -/obj/machinery/computer/monitor/secret //Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. +/// Hides the power monitor (such as ones on ruins & CentCom) from PDA's to prevent metagaming. +/obj/machinery/computer/monitor/secret name = "outdated power monitoring console" desc = "It monitors power levels across the local powernet." circuit = /obj/item/circuitboard/powermonitor/secret diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 558c13a5bef1..e4d89c6f7383 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -1,4 +1,5 @@ -/obj/machinery/constructable_frame //Made into a seperate type to make future revisions easier. +/// Made into a seperate type to make future revisions easier. +/obj/machinery/constructable_frame name = "machine frame" icon = 'icons/obj/stock_parts.dmi' icon_state = "box_0" diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index da4fa0966ba7..b997c99a49ae 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -20,7 +20,8 @@ . = ..() update_icon() -/obj/machinery/flasher/portable //Portable version of the flasher. Only flashes when anchored +/// Portable version of the flasher. Only flashes when anchored +/obj/machinery/flasher/portable name = "portable flasher" desc = "A portable flashing device. Wrench to activate and deactivate. Cannot detect slow movements." icon_state = "pflash1" diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 315acbe9555b..ccb259415121 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1230,7 +1230,8 @@ /obj/machinery/economy/vending/cigarette/syndicate/free prices = list() -/obj/machinery/economy/vending/cigarette/beach //Used in the lavaland_biodome_beach.dmm ruin +/// Used in the lavaland_biodome_beach.dmm ruin +/obj/machinery/economy/vending/cigarette/beach name = "\improper ShadyCigs Ultra" desc = "Now with extra premium products!" slogan_list = list("Turn on, tune in, drop out!", diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index d0e24c093ba8..2430888436cd 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -102,7 +102,8 @@ //////////////////////////// ARMOR BOOSTER MODULES ////////////////////////////////////////////////////////// -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants. +/// what is that noise? A BAWWW from TK mutants. +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster name = "armor booster module (Close combat weaponry)" desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate." icon_state = "mecha_abooster_ccw" diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 57db0ef075e0..202660af9b95 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -424,7 +424,7 @@ equip_cooldown = 1 SECONDS name = "mousetrap mortar" icon_state = "mecha_mousetrapmrtr" - projectile = /obj/item/assembly/mousetrap + projectile = /obj/item/assembly/mousetrap/armed fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 @@ -441,9 +441,9 @@ if(!action_checks(target)) return set_ready_state(0) - var/obj/item/assembly/mousetrap/M = new projectile(chassis.loc) + var/obj/item/assembly/mousetrap/armed/M = new projectile(chassis.loc) M.secured = TRUE - playsound(chassis, fire_sound, 60, 1) + playsound(chassis, fire_sound, 60, TRUE) M.throw_at(target, missile_range, missile_speed) projectiles-- log_message("Launched a mouse-trap from [name], targeting [target]. HONK!") diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3af23927e211..61045970526b 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -329,7 +329,7 @@ if(move_type & (MECHAMOVE_RAND | MECHAMOVE_STEP) && occupant) var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector) in loc if(possible_port) - var/obj/screen/alert/mech_port_available/A = occupant.throw_alert("mechaport", /obj/screen/alert/mech_port_available) + var/atom/movable/screen/alert/mech_port_available/A = occupant.throw_alert("mechaport", /atom/movable/screen/alert/mech_port_available) if(A) A.target = possible_port else @@ -1059,10 +1059,10 @@ if(occupant) occupant.clear_alert("mechaport") - occupant.throw_alert("mechaport_d", /obj/screen/alert/mech_port_disconnect) + occupant.throw_alert("mechaport_d", /atom/movable/screen/alert/mech_port_disconnect) log_message("Connected to gas port.") - return 1 + return TRUE /obj/mecha/proc/disconnect() if(!connected_port) @@ -1167,9 +1167,9 @@ else if(!hasInternalDamage()) SEND_SOUND(occupant, sound(nominalsound, volume = 50)) if(state) - H.throw_alert("locked", /obj/screen/alert/mech_maintenance) + H.throw_alert("locked", /atom/movable/screen/alert/mech_maintenance) if(connected_port) - H.throw_alert("mechaport_d", /obj/screen/alert/mech_port_disconnect) + H.throw_alert("mechaport_d", /atom/movable/screen/alert/mech_port_disconnect) return TRUE else return FALSE @@ -1394,20 +1394,20 @@ if(0.75 to INFINITY) occupant.clear_alert("charge") if(0.5 to 0.75) - occupant.throw_alert("charge", /obj/screen/alert/mech_lowcell, 1) + occupant.throw_alert("charge", /atom/movable/screen/alert/mech_lowcell, 1) if(0.25 to 0.5) - occupant.throw_alert("charge", /obj/screen/alert/mech_lowcell, 2) + occupant.throw_alert("charge", /atom/movable/screen/alert/mech_lowcell, 2) if(power_warned) power_warned = FALSE if(0.01 to 0.25) - occupant.throw_alert("charge", /obj/screen/alert/mech_lowcell, 3) + occupant.throw_alert("charge", /atom/movable/screen/alert/mech_lowcell, 3) if(!power_warned) SEND_SOUND(occupant, sound(lowpowersound, volume = 50)) power_warned = TRUE else - occupant.throw_alert("charge", /obj/screen/alert/mech_emptycell) + occupant.throw_alert("charge", /atom/movable/screen/alert/mech_emptycell) else - occupant.throw_alert("charge", /obj/screen/alert/mech_nocell) + occupant.throw_alert("charge", /atom/movable/screen/alert/mech_nocell) /obj/mecha/proc/reset_icon() if(initial_icon) diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 79e4670bf6d7..f52c0f5fb174 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -331,7 +331,7 @@ state = 1 to_chat(user, "The securing bolts are now exposed.") if(occupant) - occupant.throw_alert("locked", /obj/screen/alert/mech_maintenance) + occupant.throw_alert("locked", /atom/movable/screen/alert/mech_maintenance) else if(state==1) state = 0 to_chat(user, "The securing bolts are now hidden.") diff --git a/code/game/mecha/paintkits.dm b/code/game/mecha/paintkits.dm index 1aef8ebf061f..1bea84ebc626 100644 --- a/code/game/mecha/paintkits.dm +++ b/code/game/mecha/paintkits.dm @@ -1,4 +1,5 @@ -/obj/item/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs. +/// Please don't use this for anything, it's a base type for custom mech paintjobs. +/obj/item/paintkit name = "mecha customisation kit" desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech." icon = 'icons/obj/painting.dmi' @@ -21,7 +22,7 @@ allowed_types = list("ripley","firefighter") /obj/item/paintkit/mercenary - name = "\improper mercenary APLU \"Ripley\" kit" + name = "mercenary APLU \"Ripley\" kit" desc = "A kit containing all the needed tools and parts to turn an APLU \"Ripley\" into an old Mercenaries APLU." new_name = "APLU \"Strike the Earth!\"" new_desc = "Looks like an over worked, under maintained Ripley with some horrific damage." diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 75a8d868a9c9..7c59d778cb37 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -90,7 +90,7 @@ M.setDir(dir) buckled_mobs |= M ADD_TRAIT(M, TRAIT_IMMOBILIZED, BUCKLING_TRAIT) - M.throw_alert("buckled", /obj/screen/alert/restrained/buckled) + M.throw_alert("buckled", /atom/movable/screen/alert/restrained/buckled) post_buckle_mob(M) SEND_SIGNAL(src, COMSIG_MOVABLE_BUCKLE, M, force) return TRUE diff --git a/code/game/objects/effects/decals/Cleanable/alien_blood.dm b/code/game/objects/effects/decals/Cleanable/alien_blood.dm index b13fb1ad8b3e..2e02edee4a22 100644 --- a/code/game/objects/effects/decals/Cleanable/alien_blood.dm +++ b/code/game/objects/effects/decals/Cleanable/alien_blood.dm @@ -39,7 +39,8 @@ /obj/effect/decal/cleanable/blood/xtracks basecolor = "#05EE05" -/obj/effect/decal/cleanable/blood/slime // this is the alien blood file, slimes are aliens. +/// this is the alien blood file, slimes are aliens. +/obj/effect/decal/cleanable/blood/slime name = "slime jelly" desc = "It's a transparent semi-liquid from a slime or slime person. Don't lick it." basecolor = "#0b8f70" diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index c0213fe24e20..3c98c25dbb2e 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -210,7 +210,8 @@ /obj/effect/decal/cleanable/blood/drip/can_bloodcrawl_in() return TRUE -/obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose +/// not a child of blood on purpose +/obj/effect/decal/cleanable/trail_holder name = "blood" icon = 'icons/effects/effects.dmi' icon_state = "nothing" @@ -300,7 +301,8 @@ scoop_reagents = list("liquidgibs" = 5) -/obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever... +/// most ironic name ever... +/obj/effect/decal/cleanable/blood/gibs/cleangibs scoop_reagents = null mergeable_decal = TRUE diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm index 6e025ccb1525..1d39a7cfd943 100644 --- a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm +++ b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm @@ -264,7 +264,8 @@ icon = 'icons/effects/tomatodecal.dmi' random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3") -/obj/effect/decal/cleanable/pie_smudge //honk +/// honk +/obj/effect/decal/cleanable/pie_smudge name = "smashed pie" desc = "It's pie cream from a cream pie." density = FALSE @@ -307,7 +308,8 @@ reagents.add_reagent_list(scoop_reagents) no_scoop = FALSE -/obj/effect/decal/cleanable/confetti //PARTY TIME! +/// PARTY TIME! +/obj/effect/decal/cleanable/confetti name = "confetti" desc = "Party time!" gender = PLURAL diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index b08762c94cbd..a127b327d13c 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -11,7 +11,8 @@ invisibility = 101 GLOB.landmarks_list += src -/obj/effect/landmark/newplayer_start //There should only be one of these, in the lobby art area +/// There should only be one of these, in the lobby art area +/obj/effect/landmark/newplayer_start name = "start" INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you spawn in the corner of the map and things break horribly diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm index 4c868311746c..a81fc5285fe9 100644 --- a/code/game/objects/effects/spawners/airlock_spawner.dm +++ b/code/game/objects/effects/spawners/airlock_spawner.dm @@ -222,7 +222,8 @@ This spawner places pipe leading up to the interior door, you will need to finis interior_direction = WEST exterior_direction = EAST -/obj/effect/spawner/airlock/long //Long and thin +/// Long and thin +/obj/effect/spawner/airlock/long name = "long airlock spawner (interior north, exterior south)" icon_state = "1x2_N_to_S" tiles_in_y_direction = 2 @@ -250,7 +251,8 @@ This spawner places pipe leading up to the interior door, you will need to finis icon_state = "1x2_W_to_E" tiles_in_x_direction = 2 -/obj/effect/spawner/airlock/long/square //Square +/// Square +/obj/effect/spawner/airlock/long/square name = "square airlock spawner (interior north, exterior south)" icon_state = "2x2_N_to_S" tiles_in_x_direction = 2 diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 5ef0a837cad7..a556d64132ab 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -194,7 +194,8 @@ lootcount = 8 -/obj/effect/spawner/lootdrop/crate_spawner // for ruins +/// for ruins +/obj/effect/spawner/lootdrop/crate_spawner name = "lootcrate spawner" lootdoubles = FALSE loot = list( diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm index 40897a60bcd9..385b0c38ace4 100644 --- a/code/game/objects/effects/spawners/random_barrier.dm +++ b/code/game/objects/effects/spawners/random_barrier.dm @@ -47,7 +47,8 @@ /obj/structure/barricade/wooden = 1, /obj/machinery/door/airlock/welded = 1) -/obj/effect/spawner/random_barrier/possibly_welded_airlock // these have no access restrictions, so for internal maintenance only +/// these have no access restrictions, so for internal maintenance only +/obj/effect/spawner/random_barrier/possibly_welded_airlock name = "possibly welded airlock" icon_state = "airlock" result = list( diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm index 2e69b3713d97..334c9bfe64f8 100644 --- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm +++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm @@ -200,7 +200,8 @@ icon_state = "mummy_revive" duration = 20 -/obj/effect/temp_visual/heal //color is white by default, set to whatever is needed +/// color is white by default, set to whatever is needed +/obj/effect/temp_visual/heal name = "healing glow" icon_state = "heal" duration = 15 diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index e9c21cd2107a..18e3de3759ed 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -186,5 +186,6 @@ /obj/item/cardboard_cutout/setDir() dir = SOUTH -/obj/item/cardboard_cutout/adaptive //Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed +/// Purchased by Syndicate agents, these cutouts are indistinguishable from normal cutouts but aren't discolored when their appearance is changed +/obj/item/cardboard_cutout/adaptive deceptive = TRUE diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index d4f2a95c3efd..9e456005815b 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -50,7 +50,7 @@ integrated_console.network = list("ERT") /obj/item/wall_bug - name = "\improper small camera" + name = "small camera" desc = "A camera with a sticky backside." icon = 'icons/obj/device.dmi' icon_state = "wall_bug" diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index dd3e7c82d2c0..f5a857f86c5e 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -265,4 +265,5 @@ implant = null return ..() -/obj/item/flash/synthetic //just a regular flash now +/// just a regular flash now +/obj/item/flash/synthetic diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 2aafdc9e9af8..909451a633d1 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -398,7 +398,8 @@ to_chat(user, "\The [src] needs time to recharge!") return -/obj/item/flashlight/spotlight //invisible lighting source +/// invisible lighting source +/obj/item/flashlight/spotlight name = "disco light" desc = "Groovy..." icon_state = null diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 2515fbca7d81..cda7f5e34e3b 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -4,7 +4,8 @@ #define RAD_LEVEL_VERY_HIGH 800 #define RAD_LEVEL_CRITICAL 1500 -/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis +/// DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis +/obj/item/geiger_counter name = "\improper Geiger counter" desc = "A handheld device used for detecting and measuring radiation pulses." icon = 'icons/obj/device.dmi' diff --git a/code/game/objects/items/devices/painter/window_painter.dm b/code/game/objects/items/devices/painter/window_painter.dm index 83edd17bd7d9..92671f7fc71b 100644 --- a/code/game/objects/items/devices/painter/window_painter.dm +++ b/code/game/objects/items/devices/painter/window_painter.dm @@ -1,4 +1,5 @@ -/datum/painter/pipe/window // Yes, this is a pipe painter subtype. +/// Yes, this is a pipe painter subtype. +/datum/painter/pipe/window module_name = "window painter" module_state = "window_painter" var/static/list/paintable_windows = list( diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index c6c5facc872e..6e66f17366b5 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -30,7 +30,8 @@ /obj/item/radio/beacon/send_hear() return null -/obj/item/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. +/// Probably a better way of doing this, I'm lazy. +/obj/item/radio/beacon/bacon /obj/item/radio/beacon/bacon/proc/digest_delay() QDEL_IN(src, 600) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 8c4bec0239a8..14a3daf131d2 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -180,7 +180,8 @@ name = "Centcom Radio Encryption Key" channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Procedure" = 1) -/obj/item/encryptionkey/heads/ai_integrated //ported from bay, this goes 'inside' the AI. +/// ported from bay, this goes 'inside' the AI. +/obj/item/encryptionkey/heads/ai_integrated name = "AI Integrated Encryption Key" desc = "Integrated encryption key" icon_state = "cap_cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index b7be56862103..6914b9115531 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -101,7 +101,8 @@ instant = TRUE // Work instantly if there are no comms freqlock = TRUE -/obj/item/radio/headset/syndicate/alt //undisguised bowman with flash protection +/// undisguised bowman with flash protection +/obj/item/radio/headset/syndicate/alt name = "syndicate headset" desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs." flags = EARBANGPROTECT @@ -367,7 +368,8 @@ requires_tcomms = FALSE instant = TRUE -/obj/item/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway. +/// No need to care about icons, it should be hidden inside the AI anyway. +/obj/item/radio/headset/heads/ai_integrated name = "\improper AI subspace transceiver" desc = "Integrated AI radio transceiver." icon = 'icons/obj/robot_component.dmi' diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 3fb0227468d7..42f987fdb8bd 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -295,7 +295,7 @@ frequency = 1480 /obj/item/radio/intercom/locked/prison - name = "\improper prison intercom" + name = "prison intercom" desc = "Talk through this. It looks like it has been modified to not broadcast." /obj/item/radio/intercom/locked/prison/New() diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 34f767302c75..f91e4b8d75b9 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -60,7 +60,8 @@ GLOBAL_LIST_INIT(lizard_recipes, list( recipes = GLOB.lizard_recipes return ..() -/obj/item/stack/sheet/fur //basic fur sheets +/// basic fur sheets +/obj/item/stack/sheet/fur name = "pile of fur" desc = "Vulp remains." singular_name = "fur piece" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index c62f88f218dd..c6818200998b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -425,7 +425,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( else . = ..() -/obj/item/stack/sheet/cardboard //BubbleWrap +/// BubbleWrap +/obj/item/stack/sheet/cardboard name = "cardboard" desc = "Large sheets of card, like boxes folded flat." singular_name = "cardboard sheet" diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 53522602e8d4..f033792ae273 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -39,7 +39,8 @@ user.visible_message("[user] is rubbing [src] against [user.p_themselves()]! It looks like [user.p_theyre()] trying to commit suicide!") return TOXLOSS -/obj/item/nuke_core/plutonium //The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives +/// The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives +/obj/item/nuke_core/plutonium //nuke core box, for carrying the core /obj/item/nuke_core_container diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 6095e7c92ad5..244d9cd9555b 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -202,7 +202,8 @@ AI MODULES target.add_supplied_law(9, law) /****************** New Freeform ******************/ -/obj/item/aiModule/freeform // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeform name = "\improper Freeform AI module" var/newFreeFormLaw = "" var/lawpos = 15 @@ -260,7 +261,8 @@ AI MODULES return FALSE /******************** Purge ********************/ -/obj/item/aiModule/purge // -- TLE +/// -- TLE +/obj/item/aiModule/purge name = "\improper Purge AI module" desc = "A 'purge' AI Module: 'Purges all laws.'" icon_state = "standard_high" @@ -276,7 +278,8 @@ AI MODULES target.clear_inherent_laws() /******************** Asimov ********************/ -/obj/item/aiModule/asimov // -- TLE +/// -- TLE +/obj/item/aiModule/asimov name = "\improper Asimov core AI module" desc = "An 'Asimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_high" @@ -284,7 +287,8 @@ AI MODULES laws = new /datum/ai_laws/asimov /******************** Crewsimov ********************/ -/obj/item/aiModule/crewsimov // -- TLE +/// -- TLE +/obj/item/aiModule/crewsimov name = "\improper Crewsimov core AI module" desc = "An 'Crewsimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "green_low" @@ -306,7 +310,8 @@ AI MODULES laws = new /datum/ai_laws/quarantine /******************** Nanotrasen ********************/ -/obj/item/aiModule/nanotrasen // -- TLE +/// -- TLE +/obj/item/aiModule/nanotrasen name = "\improper NT Default Core AI Module" desc = "An 'NT Default' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "blue_low" @@ -329,7 +334,8 @@ AI MODULES laws = new /datum/ai_laws/drone /******************** Robocop ********************/ -/obj/item/aiModule/robocop // -- TLE +/// -- TLE +/obj/item/aiModule/robocop name = "\improper Robocop core AI module" desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'" icon_state = "red_medium" @@ -337,7 +343,8 @@ AI MODULES laws = new /datum/ai_laws/robocop() /****************** P.A.L.A.D.I.N. **************/ -/obj/item/aiModule/paladin // -- NEO +/// -- NEO +/obj/item/aiModule/paladin name = "\improper P.A.L.A.D.I.N. core AI module" desc = "A P.A.L.A.D.I.N. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_medium" @@ -345,7 +352,8 @@ AI MODULES laws = new /datum/ai_laws/paladin /****************** T.Y.R.A.N.T. *****************/ -/obj/item/aiModule/tyrant // -- Darem +/// -- Darem +/obj/item/aiModule/tyrant name = "\improper T.Y.R.A.N.T. core AI module" desc = "A T.Y.R.A.N.T. Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -353,7 +361,8 @@ AI MODULES laws = new /datum/ai_laws/tyrant() /******************** Antimov ********************/ -/obj/item/aiModule/antimov // -- TLE +/// -- TLE +/obj/item/aiModule/antimov name = "\improper Antimov core AI module" desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'" icon_state = "red_high" @@ -404,7 +413,8 @@ AI MODULES laws = new /datum/ai_laws/peacekeeper() /******************** Freeform Core ******************/ -/obj/item/aiModule/freeformcore // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/freeformcore name = "\improper Freeform core AI module" var/newFreeFormLaw = "" desc = "A 'freeform' Core AI module: ''" @@ -432,7 +442,8 @@ AI MODULES ..() /******************** Hacked AI Module ******************/ -/obj/item/aiModule/syndicate // Slightly more dynamic freeform module -- TLE +/// Slightly more dynamic freeform module -- TLE +/obj/item/aiModule/syndicate name = "hacked AI module" var/newFreeFormLaw = "" desc = "A hacked AI law module: ''" @@ -464,7 +475,8 @@ AI MODULES ..() /******************* Ion Module *******************/ -/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/// -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/obj/item/aiModule/toyAI name = "toy AI" desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm index 5fae9d5d602c..49024f6d2f4c 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_gorilla_rampage.dm @@ -1,4 +1,5 @@ -/obj/item/bio_chip/gorilla_rampage //Dumb path but easier to search for admins +/// Dumb path but easier to search for admins +/obj/item/bio_chip/gorilla_rampage name = "magillitis serum bio-chip" desc = "An experimental biochip which causes irreversable rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas." icon_state = "gorilla_rampage" diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 998dd526021b..e7af1f12ae15 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -1,4 +1,5 @@ -/obj/item/storage/bag/dice //Thankfully no longer a pill bottle. +/// Thankfully no longer a pill bottle. +/obj/item/storage/bag/dice name = "bag of dice" desc = "Contains all the luck you'll ever need." icon = 'icons/obj/dice.dmi' @@ -32,7 +33,8 @@ user.visible_message("[user] is gambling with death! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) -/obj/item/dice //depreciated d6, use /obj/item/dice/d6 if you actually want a d6 +/// depreciated d6, use /obj/item/dice/d6 if you actually want a d6 +/obj/item/dice name = "die" desc = "A die with six sides. Basic and serviceable." icon = 'icons/obj/dice.dmi' diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 1d1570344a25..d88385b56ae7 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -4,7 +4,8 @@ * Improvised garrotes */ -/obj/item/garrote // 12TC traitor item +/// 12TC traitor item +/obj/item/garrote name = "fiber wire" desc = "A length of razor-thin wire with an elegant wooden handle on either end.
You suspect you'd have to be behind the target to use this weapon effectively." icon_state = "garrot_wrap" @@ -27,7 +28,8 @@ else icon_state = "garrot_[improvised ? "I_" : ""][HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap" -/obj/item/garrote/improvised // Made via tablecrafting +/// Made via tablecrafting +/obj/item/garrote/improvised name = "garrote" desc = "A length of cable with a shoddily-carved wooden handle tied to either end.
You suspect you'd have to be behind the target to use this weapon effectively." icon_state = "garrot_I_wrap" diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 5b8cebe360db..2201e9c64930 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -366,14 +366,16 @@ else return ..() -/obj/item/grenade/chem_grenade/cryo // Intended for rare cryogenic mixes. Cools the area moderately upon detonation. +/// Intended for rare cryogenic mixes. Cools the area moderately upon detonation. +/obj/item/grenade/chem_grenade/cryo name = "cryo grenade" desc = "A custom made cryogenic grenade. It rapidly cools its contents upon detonation." icon_state = "cryog" affected_area = 2 ignition_temp = -100 -/obj/item/grenade/chem_grenade/pyro // Intended for pyrotechnical mixes. Produces a small fire upon detonation, igniting potentially flammable mixtures. +/// Intended for pyrotechnical mixes. Produces a small fire upon detonation, igniting potentially flammable mixtures. +/obj/item/grenade/chem_grenade/pyro name = "pyro grenade" desc = "A custom made pyrotechnical grenade. It heats up and ignites its contents upon detonation." icon_state = "pyrog" @@ -381,7 +383,8 @@ affected_area = 3 ignition_temp = 500 // This is enough to expose a hotspot. -/obj/item/grenade/chem_grenade/adv_release // Intended for weaker, but longer lasting effects. Could have some interesting uses. +/// Intended for weaker, but longer lasting effects. Could have some interesting uses. +/obj/item/grenade/chem_grenade/adv_release name = "advanced release grenade" desc = "A custom made advanced release grenade. It is able to be detonated more than once. Can be configured using a multitool." icon_state = "timeg" diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 3f7f3250b342..1519d002eeac 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -103,10 +103,12 @@ var/mob/living/L = AM L.adjustFireLoss(sanctify_force) // Bonus fire damage for sanctified (ERT) versions of nullrod -/obj/item/nullrod/fluff // fluff subtype to be used for all donator nullrods +/// fluff subtype to be used for all donator nullrods +/obj/item/nullrod/fluff reskin_selectable = FALSE -/obj/item/nullrod/ert // ERT subtype, applies sanctified property to any derived rod +/// ERT subtype, applies sanctified property to any derived rod +/obj/item/nullrod/ert name = "inquisitor null rod" reskin_selectable = FALSE sanctify_force = 10 @@ -370,7 +372,7 @@ /datum/hud/sword/New(mob/user) ..() - mymob.healths = new /obj/screen/healths() + mymob.healths = new /atom/movable/screen/healths() infodisplay += mymob.healths /mob/living/simple_animal/shade/sword/ClickOn(atom/A, params) @@ -471,7 +473,8 @@ user.faction |= "carp" used_blessing = TRUE -/obj/item/nullrod/claymore/bostaff //May as well make it a "claymore" and inherit the blocking +/// May as well make it a "claymore" and inherit the blocking +/obj/item/nullrod/claymore/bostaff name = "monk's staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown." icon_state = "bostaff0" diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index d3a3350cf9fb..31c817cc0673 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -273,7 +273,8 @@ if(!reuseable) flags |= DROPDEL -/obj/item/restraints/legcuffs/bola/tactical //traitor variant +/// traitor variant +/obj/item/restraints/legcuffs/bola/tactical name = "reinforced bola" desc = "A strong bola, made with a long steel chain. It looks heavy, enough so that it could trip somebody." icon_state = "bola_r" @@ -282,7 +283,8 @@ origin_tech = "engineering=4;combat=3" knockdown_duration = 2 SECONDS -/obj/item/restraints/legcuffs/bola/energy //For Security +/// For Security +/obj/item/restraints/legcuffs/bola/energy name = "energy bola" desc = "A specialized hard-light bola designed to ensnare fleeing criminals and aid in arrests." icon_state = "ebola" diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index 2086e1677e07..f07c624b1d02 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -159,7 +159,8 @@ ..() return -/obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs +/// Used by medical Syndicate cyborgs +/obj/item/melee/energy/sword/cyborg/saw name = "energy saw" desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness." force_on = 30 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index bb7afcb69199..fd54057f1879 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -173,7 +173,8 @@ requires_tank = FALSE max_weight_class = INFINITY -/obj/item/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity, but smaller +/// Obtainable by improvised methods; more gas per use, less capacity, but smaller +/obj/item/pneumatic_cannon/ghetto name = "improvised pneumatic cannon" desc = "A gas-powered, object-firing cannon made out of common parts." force = 5 diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index c5fdde6e1ade..5f362b5ffe3f 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -600,7 +600,8 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/reagent_containers/glass/bottle/reagent/hydrocodone(src) -/obj/item/storage/backpack/duffel/syndie/med/surgery_fake //for maint spawns +/// for maint spawns +/obj/item/storage/backpack/duffel/syndie/med/surgery_fake name = "surgery duffelbag" desc = "A suspicious looking duffelbag for holding surgery tools." diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 11c745f7e721..7bc630ed97e5 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -182,7 +182,8 @@ name = "cyborg mining satchel" flags = NODROP -/obj/item/storage/bag/ore/holding //miners, your messiah has arrived +/// miners, your messiah has arrived +/obj/item/storage/bag/ore/holding name = "mining satchel of holding" desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures." storage_slots = INFINITY @@ -244,7 +245,8 @@ // Because it stacks stacks, this doesn't operate normally. // However, making it a storage/bag allows us to reuse existing code in some places. -Sayu -/obj/item/storage/bag/sheetsnatcher // what is this even used for +/// what is this even used for +/obj/item/storage/bag/sheetsnatcher icon = 'icons/obj/mining.dmi' icon_state = "sheetsnatcher" name = "Sheet Snatcher" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 7079b62de981..cf5b79d57c11 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -61,7 +61,7 @@ /obj/item/storage/belt/MouseDrop(obj/over_object, src_location, over_location) var/mob/M = usr - if(!istype(over_object, /obj/screen)) + if(!is_screen_atom(over_object)) return ..() playsound(loc, "rustle", 50, TRUE, -5) if(!M.restrained() && !M.stat && can_use()) @@ -148,7 +148,8 @@ update_icon() //much roomier now that we've managed to remove two tools -/obj/item/storage/belt/utility/syndi_researcher // A cool looking belt thats essentially a syndicate toolbox +/// A cool looking belt thats essentially a syndicate toolbox +/obj/item/storage/belt/utility/syndi_researcher desc = "A belt for holding tools, but with style." icon_state = "assaultbelt" item_state = "assault" @@ -438,7 +439,8 @@ new /obj/item/grenade/chem_grenade/facid(src) //1 new /obj/item/grenade/chem_grenade/saringas(src) //1 -/obj/item/storage/belt/grenade/tactical // Traitor bundle version +/// Traitor bundle version +/obj/item/storage/belt/grenade/tactical name = "tactical grenadier belt" storage_slots = 20 // Not as many slots as the nukie one max_combined_w_class = 40 diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 43e323d98307..69816d0a4058 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -1126,7 +1126,8 @@ /obj/item/storage/box/stockparts display_contents_with_number = TRUE -/obj/item/storage/box/stockparts/basic //for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible +/// for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible +/obj/item/storage/box/stockparts/basic name = "box of stock parts" desc = "Contains a variety of basic stock parts." diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm index cd73c8b7e101..ea22a318deb5 100644 --- a/code/game/objects/items/weapons/storage/internal.dm +++ b/code/game/objects/items/weapons/storage/internal.dm @@ -37,10 +37,10 @@ if(over_object == user && Adjacent(user)) // this must come before the screen objects only block open(user) - return 0 + return FALSE - if(!istype(over_object, /obj/screen)) - return 1 + if(!is_screen_atom(over_object)) + 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... diff --git a/code/game/objects/items/weapons/storage/storage_base.dm b/code/game/objects/items/weapons/storage/storage_base.dm index b0cde0fb715a..d929b202cc86 100644 --- a/code/game/objects/items/weapons/storage/storage_base.dm +++ b/code/game/objects/items/weapons/storage/storage_base.dm @@ -26,8 +26,8 @@ var/max_combined_w_class = 14 /// The number of storage slots in this container. var/storage_slots = 7 - var/obj/screen/storage/boxes = null - var/obj/screen/close/closer = null + var/atom/movable/screen/storage/boxes = null + var/atom/movable/screen/close/closer = null /// Set this to make it possible to use this item in an inverse way, so you can have the item in your hand and click items on the floor to pick them up. var/use_to_pickup = FALSE @@ -59,14 +59,14 @@ populate_contents() - boxes = new /obj/screen/storage() + boxes = new /atom/movable/screen/storage() boxes.name = "storage" boxes.master = src boxes.icon_state = "block" boxes.screen_loc = "7,7 to 10,8" boxes.layer = HUD_LAYER boxes.plane = HUD_PLANE - closer = new /obj/screen/close() + closer = new /atom/movable/screen/close() closer.master = src closer.icon_state = "backpack_close" closer.layer = ABOVE_HUD_LAYER @@ -136,7 +136,7 @@ update_icon() // For content-sensitive icons return - if(!(istype(over_object, /obj/screen))) + if(!is_screen_atom(over_object)) return ..() if(!(loc == M) || (loc && loc.loc == M)) return diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 1607d8a1ad02..f098364adca3 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -2,10 +2,12 @@ desc = "A sleek, sturdy box." icon_state = "doom_box" -/obj/item/storage/box/syndie_kit/bundle // Traitor bundles +/// Traitor bundles +/obj/item/storage/box/syndie_kit/bundle var/list/items = list() -/obj/item/storage/box/syndie_kit/bundle/spy // 172TC +/// 172TC +/obj/item/storage/box/syndie_kit/bundle/spy name = "Spy Bundle" desc = "Complete your objectives quietly with this compilation of stealthy items." items = list( @@ -23,7 +25,8 @@ /obj/item/door_remote/omni/access_tuner, // 30 TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/agent13 // 159 +/// 159 +/obj/item/storage/box/syndie_kit/bundle/agent13 name = "Agent 13 Bundle" desc = "Find and eliminate your targets quietly and effectively with this kit." items = list( @@ -41,7 +44,8 @@ /obj/item/coin/gold, // 0TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/thief // 160TC +/// 160TC +/obj/item/storage/box/syndie_kit/bundle/thief name = "Thief Bundle" desc = "Steal from friends, enemies, and interstellar megacorporations alike!" items = list( @@ -53,7 +57,8 @@ /obj/item/storage/backpack/satchel_flat, // 10TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/bond // 137TC +/// 137TC +/obj/item/storage/box/syndie_kit/bundle/bond name = "Agent 007 Bundle" desc = "Shake your Martini and stir up trouble with this bundle of lethal equipment mixed with a spritz of gadgetry to keep things interesting." items = list( @@ -72,7 +77,8 @@ /obj/item/storage/box/syndie_kit/pen_bomb, // 30 TC /obj/item/CQC_manual) // 13TC -/obj/item/storage/box/syndie_kit/bundle/infiltrator // 155TC + RCD & Mesons Autoimplanter +/// 155TC + RCD & Mesons Autoimplanter +/obj/item/storage/box/syndie_kit/bundle/infiltrator name = "Infiltration Bundle" desc = "Use your teleporter, krav maga and other support tools to jump right into your desired location, quickly leaving as though you were never there." items = list( @@ -85,7 +91,8 @@ /obj/item/autosurgeon/organ/syndicate/meson_eyes, // 0TC /obj/item/encryptionkey/syndicate) // 2TC -/obj/item/storage/box/syndie_kit/bundle/payday // 175TC +/// 175TC +/obj/item/storage/box/syndie_kit/bundle/payday name = "Heist Bundle" desc = "Alright guys, today we're performing a heist on a space station owned by a greedy corporation. Drain the vault of all its worth so we can get that pay dirt!11" items = list( @@ -104,7 +111,8 @@ /obj/item/bio_chip_implanter/freedom/prototype, // 10 TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/implant // 200TC +/// 200TC +/obj/item/storage/box/syndie_kit/bundle/implant name = "Bio-chip Bundle" desc = "A few useful bio-chips to give you some options for when you inevitably get captured by the Security." items = list( @@ -116,7 +124,8 @@ /obj/item/bio_chip_implanter/storage, // 40TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/hacker // 180TC +/// 180TC +/obj/item/storage/box/syndie_kit/bundle/hacker name = "Hacker Bundle" desc = "A kit with everything you need to hack into and disrupt the Station, AI, its cyborgs and the Security team. HACK THE PLANET!" items = list( @@ -135,7 +144,8 @@ /obj/item/clothing/gloves/combat, // accounted in belt + toolbox /obj/item/flashlight/emp) // 4TC -/obj/item/storage/box/syndie_kit/bundle/darklord // 168TC + Telekinesis +/// 168TC + Telekinesis +/obj/item/storage/box/syndie_kit/bundle/darklord name = "Dark Lord Bundle" desc = "Turn your anger into hate and your hate into suffering with a mix of energy swords and magical powers. DO IT." items = list( @@ -150,7 +160,8 @@ /obj/item/clothing/shoes/chameleon/noslip, // 10TC /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/professional // 164TC +/// 164TC +/obj/item/storage/box/syndie_kit/bundle/professional name = "Sniper Bundle" desc = "Suit up and handle yourself like a professional with a long-distance sniper rifle, additional .50 standard and penetrator rounds and thermal glasses to easily scope out your target." items = list( @@ -164,7 +175,8 @@ /obj/item/clothing/suit/storage/iaa/blackjacket/armored, // 3TC /obj/item/encryptionkey/syndicate) // 15TC -/obj/item/storage/box/syndie_kit/bundle/grenadier // 133TC + Tactical Grenadier Belt +/// 133TC + Tactical Grenadier Belt +/obj/item/storage/box/syndie_kit/bundle/grenadier name = "Grenade Bundle" desc = "A variety of grenades and pyrotechnics to ensure you can blast your way through any situation. " items = list( @@ -180,7 +192,8 @@ /obj/item/storage/box/syndie_kit/frag_grenades, // One box, as a treat /obj/item/encryptionkey/syndicate) // 10TC -/obj/item/storage/box/syndie_kit/bundle/metroid // 115TC + modules + laser gun +/// 115TC + modules + laser gun +/obj/item/storage/box/syndie_kit/bundle/metroid name = "Modsuit Bundle" desc = "Don the equipment of an intergalactic bounty hunter and blast your way through the station!" items = list( diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index d8e18e42e5fb..5e76d2e44f9e 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -1,7 +1,8 @@ /* * Fireaxe */ -/obj/item/fireaxe // DEM AXES MAN, marker -Agouri +/// DEM AXES MAN, marker -Agouri +/obj/item/fireaxe base_icon_state = "fireaxe" lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons_righthand.dmi' @@ -41,7 +42,8 @@ var/obj/structure/W = A W.obj_destruction("fireaxe") -/obj/item/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone. +/// Blatant imitation of the fireaxe, but made out of bone. +/obj/item/fireaxe/boneaxe icon_state = "bone_axe0" base_icon_state = "bone_axe" name = "bone axe" @@ -306,7 +308,8 @@ explosive.prime() qdel(src) -/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/// Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/obj/item/spear/bonespear name = "bone spear" desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." base_icon_state = "bone_spear" @@ -1017,7 +1020,8 @@ #undef BROOM_PUSH_LIMIT -/obj/item/supermatter_halberd //Supermatter Halberd, used by Oblivion Enforcers +/// Supermatter Halberd, used by Oblivion Enforcers +/obj/item/supermatter_halberd name = "supermatter halberd" desc = "The revered weapon of Oblivion Enforcers, used to enforce the Order's will." lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi' diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index d34c9007ffb0..66c122013ab5 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,4 +1,5 @@ -/obj/structure/sign/barsign // All Signs are 64 by 32 pixels, they take two tiles +/// All Signs are 64 by 32 pixels, they take two tiles +/obj/structure/sign/barsign name = "Bar Sign" desc = "A bar sign with no writing on it." icon = 'icons/obj/barsigns.dmi' diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 0e5146890c78..9acb55729184 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -233,7 +233,7 @@ /obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user) ..() - if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete + if(is_screen_atom(O)) //fix for HUD elements making their way into the world -Pete return if(O.loc == user) return @@ -371,7 +371,7 @@ /obj/structure/closet/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) /obj/structure/closet/ex_act(severity) for(var/atom/A in contents) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm index 28d421596d69..2ac142b2c3c8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm @@ -33,7 +33,8 @@ new /obj/item/storage/bag/mail(src) new /obj/item/melee/knuckleduster/nanotrasen(src) -/obj/structure/closet/secure_closet/quartermaster/lavaland //used in mining outpost +/// used in mining outpost +/obj/structure/closet/secure_closet/quartermaster/lavaland name = "quartermaster's secondary locker" /obj/structure/closet/secure_closet/quartermaster/lavaland/populate_contents() diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 38240e163151..5dffb626cf73 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -1,4 +1,5 @@ -/obj/structure/closet/statue //this type path is a crime, ponies what the fuck +/// this type path is a crime, ponies what the fuck +/obj/structure/closet/statue name = "statue" desc = "An incredibly lifelike marble carving" icon = 'icons/obj/statue.dmi' diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index 2e75b13bd152..f816563f3a93 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -22,14 +22,16 @@ return return ..() -/obj/structure/fluff/empty_terrarium //Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated. +/// Empty terrariums are created when a preserved terrarium in a lavaland seed vault is activated. +/obj/structure/fluff/empty_terrarium name = "empty terrarium" desc = "An ancient machine that seems to be used for storing plant matter. Its hatch is ajar." icon = 'icons/obj/lavaland/spawners.dmi' icon_state = "terrarium_open" density = TRUE -/obj/structure/fluff/empty_sleeper //Empty sleepers are created by a good few ghost roles in lavaland. +/// Empty sleepers are created by a good few ghost roles in lavaland. +/obj/structure/fluff/empty_sleeper name = "empty sleeper" desc = "An open sleeper. It looks as though it would be awaiting another patient, were it not broken." icon = 'icons/obj/cryogenic2.dmi' @@ -44,13 +46,15 @@ /obj/structure/fluff/empty_sleeper/syndicate icon_state = "sleeper_s-open" -/obj/structure/fluff/empty_cryostasis_sleeper //Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated +/// Empty cryostasis sleepers are created when a malfunctioning cryostasis sleeper in a lavaland shelter is activated +/obj/structure/fluff/empty_cryostasis_sleeper name = "empty cryostasis sleeper" desc = "Although comfortable, this sleeper won't function as anything but a bed ever again." icon = 'icons/obj/lavaland/spawners.dmi' icon_state = "cryostasis_sleeper_open" -/obj/structure/fluff/drake_statue //Ash drake status spawn on either side of the necropolis gate in lavaland. +/// Ash drake status spawn on either side of the necropolis gate in lavaland. +/obj/structure/fluff/drake_statue name = "drake statue" desc = "A towering basalt sculpture of a proud and regal drake. Its eyes are six glowing gemstones." icon = 'icons/effects/64x64.dmi' @@ -60,7 +64,8 @@ deconstructible = FALSE layer = EDGED_TURF_LAYER -/obj/structure/fluff/drake_statue/falling //A variety of statue in disrepair; parts are broken off and a gemstone is missing +/// A variety of statue in disrepair; parts are broken off and a gemstone is missing +/obj/structure/fluff/drake_statue/falling desc = "A towering basalt sculpture of a drake. Cracks run down its surface and parts of it have fallen off." icon_state = "drake_statue_falling" diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 6effd6dd37e2..fbc538af4a15 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -277,7 +277,8 @@ C.add_queued_power_demand(C.get_queued_available_power() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() -/obj/structure/grille/broken // Pre-broken grilles for map placement +/// Pre-broken grilles for map placement +/obj/structure/grille/broken icon_state = "brokengrille" density = FALSE obj_integrity = 20 diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 9d2860fd7748..d01c09a789bc 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -96,7 +96,8 @@ R.add_fingerprint(user) qdel(src) -/obj/structure/inflatable/door //Based on mineral door code +/// Based on mineral door code +/obj/structure/inflatable/door name = "inflatable door" icon_state = "door_closed" torn = /obj/item/inflatable/door/torn diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index e7281879e280..5d80c18fe1a4 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -241,7 +241,7 @@ /obj/structure/morgue/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2) /* * Morgue tray @@ -534,7 +534,7 @@ GLOBAL_LIST_EMPTY(crematoriums) /obj/structure/crematorium/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2) /* * Crematorium tray diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 126142a7e6f3..d33997709797 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -94,7 +94,8 @@ new /obj/item/stack/sheet/plastic/five(loc) qdel(src) -/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates +/// A specific type for mining that doesn't allow airflow because of them damn crates +/obj/structure/plasticflaps/mining name = "airtight plastic flaps" desc = "Heavy duty, airtight, plastic flaps." diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 266460cc6a9d..ff67ffde85ac 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -15,12 +15,14 @@ /obj/structure/railing/get_climb_text() return "You can Click-Drag yourself to [src] to climb over it after a short delay." -/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch +/// aesthetic corner sharp edges hurt oof ouch +/obj/structure/railing/corner icon_state = "railing_corner" density = FALSE climbable = FALSE -/obj/structure/railing/cap //aestetic "end" for railing +/// aestetic "end" for railing +/obj/structure/railing/cap icon_state = "railing_cap" density = FALSE climbable = FALSE diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 63eaf9932be9..f3bd37e0600b 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -359,13 +359,13 @@ GLOBAL_LIST_EMPTY(safes) drill.song.start_playing(driller) notify_ghosts("Security assault in progress in [get_area(src)]!", enter_link="(Click to jump to!)", source = src, action = NOTIFY_FOLLOW) for(var/mob/dead/observer/O in GLOB.player_list) - O.overlay_fullscreen("payback", /obj/screen/fullscreen/payback, 0) + O.overlay_fullscreen("payback", /atom/movable/screen/fullscreen/payback, 0) addtimer(CALLBACK(src, PROC_REF(ghost_payback_phase_2)), 2.7 SECONDS) /obj/structure/safe/proc/ghost_payback_phase_2() for(var/mob/dead/observer/O in GLOB.player_list) O.clear_fullscreen("payback") - O.overlay_fullscreen("payback", /obj/screen/fullscreen/payback, 1) + O.overlay_fullscreen("payback", /atom/movable/screen/fullscreen/payback, 1) addtimer(CALLBACK(src, PROC_REF(clear_payback)), 2 MINUTES) /obj/structure/safe/proc/clear_payback() diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 4503aa524c4b..43d4c263c187 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -232,39 +232,39 @@ icon_state = "kidanplaque" /obj/structure/sign/mech - name = "\improper mech painting" + name = "mech painting" desc = "A painting of a mech." icon_state = "mech" /obj/structure/sign/nuke - name = "\improper nuke painting" + name = "nuke painting" desc = "A painting of a nuke." icon_state = "nuke" /obj/structure/sign/clown - name = "\improper clown painting" + name = "clown painting" desc = "A painting of the clown and mime. Awwww." icon_state = "clown" /obj/structure/sign/bobross - name = "\improper calming painting" + name = "calming painting" desc = "We don't make mistakes, just happy little accidents." icon_state = "bob" /obj/structure/sign/singulo - name = "\improper singulo painting" + name = "singulo painting" desc = "A mesmerizing painting of a singularity. It seems to suck you in..." icon_state = "singulo" /obj/structure/sign/barber - name = "\improper barber shop sign" + name = "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" + name = "chinese restaurant sign" desc = "A glowing dragon invites you in." icon_state = "chinese" does_emissive = TRUE diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index c62d9d426ac9..f6ece981b4ca 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -264,7 +264,8 @@ desc = "A cheap statue of sandstone for a greyshirt." icon_state = "assist" -/obj/structure/statue/sandstone/venus //call me when we add marble i guess +/// call me when we add marble i guess +/obj/structure/statue/sandstone/venus name = "statue of a pure maiden" desc = "An ancient marble statue. The subject is depicted with a floor-length braid and is wielding a toolbox. By Jove, it's easily the most gorgeous depiction of a woman you've ever seen. The artist must truly be a master of his craft. Shame about the broken arm, though." icon = 'icons/obj/statuelarge.dmi' diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 10a43fe214d3..0c3dd3edabc1 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -75,7 +75,7 @@ if(istype(hugger_mask) && !hugger_mask.sterile && (locate(/obj/item/organ/internal/body_egg/alien_embryo) in buckled_mob.internal_organs)) if(user && !isalien(user)) return - buckled_mob.throw_alert("ghost_nest", /obj/screen/alert/ghost) + buckled_mob.throw_alert("ghost_nest", /atom/movable/screen/alert/ghost) to_chat(buckled_mob, "You may now ghost, you keep respawnability in this state. You will be alerted when you're removed from the nest.") /obj/structure/bed/nest/post_buckle_mob(mob/living/M) 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 125a515a2f2f..6f01518ae994 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -1,4 +1,5 @@ -/obj/structure/chair // fuck you Pete +/// fuck you Pete +/obj/structure/chair name = "chair" desc = "You sit in this. Either by will or force." icon = 'icons/obj/chairs.dmi' diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index fce002c46a56..950a932c4055 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -621,7 +621,8 @@ if(!total_override) ..() -/obj/structure/table/wood/poker //No specialties, Just a mapping object. +/// No specialties, Just a mapping object. +/obj/structure/table/wood/poker name = "gambling table" desc = "A seedy table for seedy dealings in seedy places." icon = 'icons/obj/smooth_structures/tables/poker_table.dmi' diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index f22e746da5ce..284b39dd50f3 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -610,7 +610,8 @@ can_rotate = 0 -/obj/structure/sink/puddle //splishy splashy ^_^ +/// splishy splashy ^_^ +/obj/structure/sink/puddle name = "puddle" desc = "A puddle of clean water. Looks refreshing." icon_state = "puddle" diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm index dd869e06ae0f..bb56be30dffd 100644 --- a/code/game/turfs/simulated/floor/asteroid_floors.dm +++ b/code/game/turfs/simulated/floor/asteroid_floors.dm @@ -110,7 +110,8 @@ floor_variance = 15 digResult = /obj/item/stack/ore/glass/basalt -/turf/simulated/floor/plating/asteroid/basalt/lava //lava underneath +/// lava underneath +/turf/simulated/floor/plating/asteroid/basalt/lava baseturf = /turf/simulated/floor/lava /turf/simulated/floor/plating/asteroid/basalt/airless @@ -185,7 +186,8 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me var/data_having_type = /turf/simulated/floor/plating/asteroid/airless/cave/has_data turf_type = /turf/simulated/floor/plating/asteroid/airless -/turf/simulated/floor/plating/asteroid/airless/cave/has_data //subtype for producing a tunnel with given data +/// subtype for producing a tunnel with given data +/turf/simulated/floor/plating/asteroid/airless/cave/has_data has_data = TRUE /turf/simulated/floor/plating/asteroid/airless/cave/volcanic @@ -201,7 +203,8 @@ GLOBAL_LIST_INIT(megafauna_spawn_list, list(/mob/living/simple_animal/hostile/me nitrogen = 23 temperature = 300 -/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data //subtype for producing a tunnel with given data +/// subtype for producing a tunnel with given data +/turf/simulated/floor/plating/asteroid/airless/cave/volcanic/has_data has_data = TRUE /turf/simulated/floor/plating/asteroid/airless/cave/Initialize(mapload) diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index a7c41e9edc83..17264977073f 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -85,14 +85,16 @@ base_icon_state = "junglegrass" smoothing_groups = list(SMOOTH_GROUP_TURF, SMOOTH_GROUP_GRASS, SMOOTH_GROUP_JUNGLE_GRASS) -/turf/simulated/floor/grass/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/// This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/turf/simulated/floor/grass/no_creep smoothing_flags = null smoothing_groups = null canSmoothWith = null layer = GRASS_UNDER_LAYER transform = null -/turf/simulated/floor/grass/jungle/no_creep //This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/// This vairant shows up under normal turfs so fits in the regular 32x32 sprite +/turf/simulated/floor/grass/jungle/no_creep smoothing_flags = null smoothing_groups = null canSmoothWith = null diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm index a2343a5e061b..2cccdda02749 100644 --- a/code/game/turfs/simulated/floor/indestructible.dm +++ b/code/game/turfs/simulated/floor/indestructible.dm @@ -63,7 +63,8 @@ nitrogen = MOLES_N2STANDARD temperature = T20C -/turf/simulated/floor/indestructible/boss //you put stone tiles on this and use it as a base +/// you put stone tiles on this and use it as a base +/turf/simulated/floor/indestructible/boss name = "necropolis floor" icon = 'icons/turf/floors/boss_floors.dmi' icon_state = "boss" diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index d3090e85ebc3..5726cc958b97 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -1,5 +1,5 @@ /turf/simulated/floor/light - name = "\improper light floor" + name = "light floor" light_range = 0 icon_state = "light_off" floor_tile = /obj/item/stack/tile/light diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 9f2a665bf04e..8a1de89314e7 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -91,7 +91,8 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER -/turf/simulated/floor/beach/water // TODO - Refactor water so they share the same parent type - Or alternatively component something like that +/// TODO - Refactor water so they share the same parent type - Or alternatively component something like that +/turf/simulated/floor/beach/water name = "water" icon_state = "water" mouse_opacity = MOUSE_OPACITY_TRANSPARENT diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm index 96e24e507c0c..2e8f6935c2ce 100644 --- a/code/game/turfs/simulated/floor/plasteel_floor.dm +++ b/code/game/turfs/simulated/floor/plasteel_floor.dm @@ -19,7 +19,8 @@ . = ..() name = "floor" -/turf/simulated/floor/plasteel/airless/indestructible // For bomb testing range +/// For bomb testing range +/turf/simulated/floor/plasteel/airless/indestructible /turf/simulated/floor/plasteel/airless/indestructible/ex_act(severity) return diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index c439a00b1b50..108f5a51d83a 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -1,6 +1,7 @@ /**********************Mineral deposits**************************/ -/turf/simulated/mineral //wall piece +/// wall piece +/turf/simulated/mineral name = "rock" icon = 'icons/turf/walls/smoothrocks.dmi' icon_state = "smoothrocks-0" diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm index 09d0b7cc4368..1dc17ad67d46 100644 --- a/code/game/turfs/simulated/walls_mineral.dm +++ b/code/game/turfs/simulated/walls_mineral.dm @@ -212,7 +212,8 @@ /////////////////////Titanium walls///////////////////// -/turf/simulated/wall/mineral/titanium //has to use this path due to how building walls works +/// has to use this path due to how building walls works +/turf/simulated/wall/mineral/titanium name = "wall" desc = "A light-weight titanium wall used in shuttles." icon = 'icons/turf/walls/plastinum_wall.dmi' diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index eca159708709..9cbb85755792 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -6,7 +6,8 @@ /turf/space/transit/attackby(obj/O as obj, mob/user as mob, params) return -/turf/space/transit/north // moving to the north +/// moving to the north +/turf/space/transit/north pushdirection = SOUTH // south because the space tile is scrolling south @@ -56,7 +57,8 @@ /turf/space/transit/north/shuttlespace_ns15 icon_state = "speedspace_ns_15" -/turf/space/transit/east // moving to the east +/// moving to the east +/turf/space/transit/east pushdirection = WEST /turf/space/transit/east/shuttlespace_ew1 diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 344db25398c1..56accd28d924 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -2,19 +2,15 @@ GLOBAL_LIST_EMPTY(admin_datums) GLOBAL_PROTECT(admin_datums) // This is protected because we dont want people making their own admin ranks, for obvious reasons /datum/admins - var/rank = "Temporary Admin" - var/client/owner = null + var/rank = "Temporary Admin" + var/client/owner + /// Bitflag containing the current rights this admin holder is assigned to var/rights = 0 - var/fakekey = null - var/big_brother = 0 - + var/fakekey + var/big_brother = FALSE + /// Our currently linked marked datum var/datum/marked_datum - var/admincaster_screen = 0 //See newscaster.dm under machinery for a full description - var/datum/feed_message/admincaster_feed_message = new /datum/feed_message //These two will act as holders. - var/datum/feed_channel/admincaster_feed_channel = new /datum/feed_channel - var/admincaster_signature //What you'll sign the newsfeeds as - /datum/admins/New(initial_rank = "Temporary Admin", initial_rights = 0, ckey) if(IsAdminAdvancedProcCall()) to_chat(usr, "Admin rank creation blocked: Advanced ProcCall detected.") @@ -25,7 +21,6 @@ GLOBAL_PROTECT(admin_datums) // This is protected because we dont want people ma error("Admin datum created without a ckey argument. Datum has been deleted") qdel(src) return - admincaster_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]" rank = initial_rank rights = initial_rights GLOB.admin_datums[ckey] = src diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index ea6345143afe..b28f460e4f5e 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -174,7 +174,8 @@ ///////////SLAUGHTER DEMON -/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game +/// Warning edgiest item in the game +/obj/item/antag_spawner/slaughter_demon name = "vial of blood" desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures." icon = 'icons/obj/wizard.dmi' diff --git a/code/modules/antagonists/changeling/powers/become_headslug.dm b/code/modules/antagonists/changeling/powers/become_headslug.dm index a5c7b712ffc4..06301121e983 100644 --- a/code/modules/antagonists/changeling/powers/become_headslug.dm +++ b/code/modules/antagonists/changeling/powers/become_headslug.dm @@ -13,7 +13,7 @@ if(cling.headslugged) to_chat(user, "We need to absorb a humanoid to headslug again.") return - if(tgui_alert("Are you sure you wish to do this? This action cannot be undone.",,"Yes","No") != "Yes") + if(tgui_alert(user, "Are you sure you wish to do this? This action cannot be undone.", "Sting", list("Yes", "No")) != "Yes") return cling.headslugged = TRUE ..() diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 504c568f8a31..39b34d949493 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -127,7 +127,8 @@ SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("[name]")) return TRUE -/datum/action/changeling/sting/cryo //Enable when mob cooling is fixed so that frostoil actually makes you cold, instead of mostly just hungry. +/// Enable when mob cooling is fixed so that frostoil actually makes you cold, instead of mostly just hungry. +/datum/action/changeling/sting/cryo name = "Cryogenic Sting" desc = "We silently sting our victim with a cocktail of chemicals that freezes them from the inside. Costs 15 chemicals." helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing." diff --git a/code/modules/antagonists/vampire/vamp_datum.dm b/code/modules/antagonists/vampire/vamp_datum.dm index 3b5b91c81a0b..d5a096bcef52 100644 --- a/code/modules/antagonists/vampire/vamp_datum.dm +++ b/code/modules/antagonists/vampire/vamp_datum.dm @@ -260,7 +260,7 @@ if(owner.current.hud_used) var/datum/hud/hud = owner.current.hud_used if(!hud.vampire_blood_display) - hud.vampire_blood_display = new /obj/screen() + hud.vampire_blood_display = new /atom/movable/screen() hud.vampire_blood_display.name = "Usable Blood" hud.vampire_blood_display.icon_state = "blood_display" hud.vampire_blood_display.screen_loc = "WEST:6,CENTER-1:15" diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index 2dc8bd21e1d1..42dc9c3fb250 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -188,7 +188,8 @@ /obj/effect/hotspot/singularity_pull() return -/obj/effect/hotspot/fake // Largely for the fireflash procs below +/// Largely for the fireflash procs below +/obj/effect/hotspot/fake fake = TRUE burn_time = 30 diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 58c4b12f163d..9623efed4936 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -117,7 +117,8 @@ custom_name = TRUE req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE) -/obj/machinery/alarm/syndicate //general syndicate access +/// general syndicate access +/obj/machinery/alarm/syndicate report_danger_level = FALSE remote_control = FALSE req_access = list(ACCESS_SYNDICATE) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 9e2adeec3fcd..daa791d502c9 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -73,7 +73,8 @@ open() to_chat(user, "You [open ? "open" : "close"] [src].") -/obj/machinery/atmospherics/binary/valve/digital // can be controlled by AI +/// can be controlled by AI +/obj/machinery/atmospherics/binary/valve/digital name = "digital valve" desc = "A digitally controlled valve." icon = 'icons/atmos/digital_valve.dmi' diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm index 5797b62cf214..27871d8613ef 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm @@ -104,7 +104,8 @@ sleep(10) switch_side() -/obj/machinery/atmospherics/trinary/tvalve/digital // can be controlled by AI +/// can be controlled by AI +/obj/machinery/atmospherics/trinary/tvalve/digital name = "digital switching valve" desc = "A digitally controlled valve." icon = 'icons/atmos/digital_tvalve.dmi' diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index f35ceb6ef5d7..f9867a8c621b 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -482,7 +482,7 @@ return /obj/machinery/atmospherics/unary/cryo_cell/get_remote_view_fullscreens(mob/user) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) /obj/machinery/atmospherics/unary/cryo_cell/update_remote_sight(mob/living/user) return //we don't see the pipe network while inside cryo. diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm index bec7c33ed3a5..88e5426a374b 100644 --- a/code/modules/awaymissions/mission_code/beach.dm +++ b/code/modules/awaymissions/mission_code/beach.dm @@ -55,7 +55,8 @@ . = ..() //adds some aesthetic randomness to the beach sand icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4") -/turf/simulated/floor/beach/away/sand/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/sand/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/sand/dense @@ -71,7 +72,8 @@ clawfootstep = FOOTSTEP_WATER heavyfootstep = FOOTSTEP_WATER -/turf/simulated/floor/beach/away/coastline/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/coastline/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/coastline/dense @@ -117,7 +119,8 @@ temperature = 300 planetary_atmos = TRUE -/turf/simulated/floor/beach/away/water/dense //for boundary "walls" +/// for boundary "walls" +/turf/simulated/floor/beach/away/water/dense density = TRUE baseturf = /turf/simulated/floor/beach/away/water/dense diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index ce7fe813a6fe..0035bfbb491a 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -12,10 +12,10 @@ var/switch_state = BM_SWITCHSTATE_NONE var/switch_width = 5 // modeswitch UI - var/obj/screen/buildmode/mode/modebutton + var/atom/movable/screen/buildmode/mode/modebutton var/list/modeswitch_buttons = list() // dirswitch UI - var/obj/screen/buildmode/bdir/dirbutton + var/atom/movable/screen/buildmode/bdir/dirbutton var/list/dirswitch_buttons = list() /datum/click_intercept/buildmode/New() @@ -32,23 +32,23 @@ /datum/click_intercept/buildmode/create_buttons() // keep a reference so we can update it upon mode switch - modebutton = new /obj/screen/buildmode/mode(src) + modebutton = new /atom/movable/screen/buildmode/mode(src) buttons += modebutton - buttons += new /obj/screen/buildmode/help(src) + buttons += new /atom/movable/screen/buildmode/help(src) // keep a reference so we can update it upon dir switch - dirbutton = new /obj/screen/buildmode/bdir(src) + dirbutton = new /atom/movable/screen/buildmode/bdir(src) buttons += dirbutton - buttons += new /obj/screen/buildmode/quit(src) + buttons += new /atom/movable/screen/buildmode/quit(src) // build the list of modeswitching buttons - build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /obj/screen/buildmode/modeswitch) - build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /obj/screen/buildmode/dirswitch) + build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /atom/movable/screen/buildmode/modeswitch) + build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /atom/movable/screen/buildmode/dirswitch) /datum/click_intercept/buildmode/proc/build_options_grid(list/elements, list/buttonslist, buttontype) var/pos_idx = 0 for(var/thing in elements) var/x = pos_idx % switch_width var/y = FLOOR(pos_idx / switch_width, 1) - var/obj/screen/buildmode/B = new buttontype(src, thing) + var/atom/movable/screen/buildmode/B = new buttontype(src, thing) // this stuff is equivalent to the commented out line for 511 compat // B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]" B.screen_loc = "NORTH-[1 + FLOOR(0.5 + 1.5*y, 1) + ((y + 1) % 2)]:[16*((y + 1) % 2)],WEST+[FLOOR(0.5 + 1.5*x, 1)]:[16*((x + 1) % 2)]" diff --git a/code/modules/buildmode/buildmode_hud.dm b/code/modules/buildmode/buildmode_hud.dm index 7c18de6be90c..3c26c03be6cc 100644 --- a/code/modules/buildmode/buildmode_hud.dm +++ b/code/modules/buildmode/buildmode_hud.dm @@ -1,22 +1,22 @@ -/obj/screen/buildmode +/atom/movable/screen/buildmode icon = 'icons/misc/buildmode.dmi' var/datum/click_intercept/buildmode/bd plane = HUD_PLANE_BUILDMODE -/obj/screen/buildmode/New(bld) +/atom/movable/screen/buildmode/New(bld) bd = bld return ..() -/obj/screen/buildmode/Destroy() +/atom/movable/screen/buildmode/Destroy() bd = null return ..() -/obj/screen/buildmode/mode +/atom/movable/screen/buildmode/mode name = "Toggle Mode" icon_state = "buildmode_basic" screen_loc = "NORTH,WEST" -/obj/screen/buildmode/mode/Click(location, control, params) +/atom/movable/screen/buildmode/mode/Click(location, control, params) var/list/pa = params2list(params) if(pa.Find("left")) @@ -26,64 +26,64 @@ update_icon() return TRUE -/obj/screen/buildmode/mode/update_icon_state() +/atom/movable/screen/buildmode/mode/update_icon_state() icon_state = bd.mode.get_button_iconstate() -/obj/screen/buildmode/help +/atom/movable/screen/buildmode/help icon_state = "buildhelp" screen_loc = "NORTH,WEST+1" name = "Buildmode Help" -/obj/screen/buildmode/help/Click() +/atom/movable/screen/buildmode/help/Click() bd.mode.show_help(usr) return TRUE -/obj/screen/buildmode/bdir +/atom/movable/screen/buildmode/bdir icon_state = "build" screen_loc = "NORTH,WEST+2" name = "Change Dir" -/obj/screen/buildmode/bdir/update_icon(updates=UPDATE_ICON_STATE) +/atom/movable/screen/buildmode/bdir/update_icon(updates=UPDATE_ICON_STATE) dir = bd.build_dir ..() -/obj/screen/buildmode/bdir/Click() +/atom/movable/screen/buildmode/bdir/Click() bd.toggle_dirswitch() update_icon() return TRUE // used to switch between modes -/obj/screen/buildmode/modeswitch +/atom/movable/screen/buildmode/modeswitch var/datum/buildmode_mode/modetype -/obj/screen/buildmode/modeswitch/New(bld, mt) +/atom/movable/screen/buildmode/modeswitch/New(bld, mt) modetype = mt icon_state = "buildmode_[initial(modetype.key)]" name = initial(modetype.key) return ..(bld) -/obj/screen/buildmode/modeswitch/Click() +/atom/movable/screen/buildmode/modeswitch/Click() bd.change_mode(modetype) return TRUE // used to switch between dirs -/obj/screen/buildmode/dirswitch +/atom/movable/screen/buildmode/dirswitch icon_state = "build" -/obj/screen/buildmode/dirswitch/New(bld, newdir) +/atom/movable/screen/buildmode/dirswitch/New(bld, newdir) dir = newdir name = dir2text(dir) return ..(bld) -/obj/screen/buildmode/dirswitch/Click() +/atom/movable/screen/buildmode/dirswitch/Click() bd.change_dir(dir) return TRUE -/obj/screen/buildmode/quit +/atom/movable/screen/buildmode/quit icon_state = "buildquit" screen_loc = "NORTH,WEST+3" name = "Quit Buildmode" -/obj/screen/buildmode/quit/Click() +/atom/movable/screen/buildmode/quit/Click() bd.quit() return TRUE diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 390f425611c9..1cb3985bae65 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -56,7 +56,7 @@ preload_rsc = 0 // This is 0 so we can set it to an URL once the player logs in and have them download the resources from a different server. - var/obj/screen/click_catcher/void + var/atom/movable/screen/click_catcher/void var/ip_intel = "Disabled" @@ -66,7 +66,7 @@ var/datum/tooltip/tooltips // Overlay for showing debug info - var/obj/screen/debugtextholder/debug_text_overlay + var/atom/movable/screen/debugtextholder/debug_text_overlay /// Persistent storage for the flavour text of examined atoms. var/list/description_holders = list() diff --git a/code/modules/client/preference/link_processing.dm b/code/modules/client/preference/link_processing.dm index 27f9467045fa..a37c78cff057 100644 --- a/code/modules/client/preference/link_processing.dm +++ b/code/modules/client/preference/link_processing.dm @@ -1032,7 +1032,7 @@ if("thought_bubble") toggles2 ^= PREFTOGGLE_2_THOUGHT_BUBBLE if(length(parent?.screen)) - var/obj/screen/plane_master/point/PM = locate(/obj/screen/plane_master/point) in parent.screen + var/atom/movable/screen/plane_master/point/PM = locate(/atom/movable/screen/plane_master/point) in parent.screen PM.backdrop(parent.mob) if("be_special") @@ -1112,7 +1112,7 @@ if("ambientocclusion") toggles ^= PREFTOGGLE_AMBIENT_OCCLUSION if(length(parent?.screen)) - var/obj/screen/plane_master/game_world/PM = locate(/obj/screen/plane_master/game_world) in parent.screen + var/atom/movable/screen/plane_master/game_world/PM = locate(/atom/movable/screen/plane_master/game_world) in parent.screen PM.backdrop(parent.mob) if("parallax") diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index 1bd791fa8cba..03bde7c6b0e0 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -101,7 +101,8 @@ user.update_inv_l_hand() user.update_inv_r_hand() -/obj/item/clothing/glasses/meson/engine/tray //atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves +/// atmos techs have lived far too long without tray goggles while those damned engineers get their dual-purpose gogles all to themselves +/obj/item/clothing/glasses/meson/engine/tray name = "optical t-ray scanner" icon_state = "trayson-t-ray" item_state = "trayson-t-ray" diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm index c2b8ea24035a..59c567846ed2 100644 --- a/code/modules/clothing/gloves/colored_gloves.dm +++ b/code/modules/clothing/gloves/colored_gloves.dm @@ -14,7 +14,8 @@ /obj/item/clothing/gloves/color/yellow/fake siemens_coefficient = 1 -/obj/item/clothing/gloves/color/fyellow //Cheap Chinese Crap +/// Cheap Chinese Crap +/obj/item/clothing/gloves/color/fyellow name = "budget insulated gloves" desc = "These gloves are cheap copies of the coveted gloves, no way this can end badly." icon_state = "yellow" diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index 1de30c936a8a..ed180788bc94 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -44,7 +44,8 @@ material = "silver" ring_color = "silver" -/obj/item/clothing/gloves/ring/silver/blessed // todo +/// todo +/obj/item/clothing/gloves/ring/silver/blessed name = "blessed silver ring" /obj/item/clothing/gloves/ring/gold diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm index 67dedaa65589..21e0bc2b4a7c 100644 --- a/code/modules/clothing/head/beanie.dm +++ b/code/modules/clothing/head/beanie.dm @@ -3,7 +3,8 @@ //Plus a bobble hat, lets be inclusive!! -/obj/item/clothing/head/beanie //Default is white, this is meant to be seen +/// Default is white, this is meant to be seen +/obj/item/clothing/head/beanie name = "white beanie" desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads." icon_state = "beanie" //Default white diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index 501bfcb60b90..2c7f0890a613 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -392,7 +392,8 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) -/obj/item/clothing/head/stalhelm //Why do these exist - Because they aren't specifically Nazi Germany +/// Why do these exist - Because they aren't specifically Nazi Germany +/obj/item/clothing/head/stalhelm name = "clown stalhelm" desc = "The typical clown soldier's helmet." icon_state = "stalhelm" @@ -415,7 +416,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/head/beret/purple //Fluff? +/// Fluff? +/obj/item/clothing/head/beret/purple name = "Pierson Family Beret" desc = " A purple beret, with a small golden crescent moon sewn onto it." icon_state = "beret_purple" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0756c90bfc84..7c45bb6ca1cc 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -312,7 +312,7 @@ actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase) /obj/item/clothing/mask/gas/sechailer/blue - name = "\improper blue SWAT mask" + name = "blue SWAT mask" desc = "A neon blue swat mask, used for demoralizing Greytide in the wild." icon_state = "blue_sechailer" item_state = "blue_sechailer" diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index ce849a5016fe..25f49a27a8ba 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -94,7 +94,8 @@ magboot_state = "syndiemag" origin_tech = "magnets=4;syndicate=2" -/obj/item/clothing/shoes/magboots/elite //For the Syndicate Strike Team/SolGov/Tactical Teams +/// For the Syndicate Strike Team/SolGov/Tactical Teams +/obj/item/clothing/shoes/magboots/elite name = "elite tactical magboots" desc = "Advanced magboots used by strike teams across the system. Allows for tactical insertion into low-gravity areas of operation." icon_state = "elitemag0" @@ -143,7 +144,8 @@ to_chat(user, "You switch on the waddle dampeners!") enabled_waddle = FALSE -/obj/item/clothing/shoes/magboots/wizard //bundled with the wiz hardsuit +/// bundled with the wiz hardsuit +/obj/item/clothing/shoes/magboots/wizard name = "boots of gripping" desc = "These magical boots, once activated, will stay gripped to any surface without slowing you down." icon_state = "wizmag0" diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm index 86b85ccb40f7..40e71c543563 100644 --- a/code/modules/clothing/shoes/misc_shoes.dm +++ b/code/modules/clothing/shoes/misc_shoes.dm @@ -3,7 +3,8 @@ icon_state = "mime" item_color = "mime" -/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses +/// basic syndicate combat boots for nuke ops and mob corpses +/obj/item/clothing/shoes/combat name = "combat boots" desc = "High speed, low drag combat boots." w_class = WEIGHT_CLASS_NORMAL @@ -14,7 +15,8 @@ strip_delay = 70 resistance_flags = NONE -/obj/item/clothing/shoes/combat/swat //overpowered gimmick boots +/// overpowered gimmick boots +/obj/item/clothing/shoes/combat/swat name = "\improper SWAT shoes" desc = "High speed, no drag combat boots." permeability_coefficient = 0.01 @@ -57,7 +59,8 @@ desc = "A pair of purple rubber boots, designed to prevent slipping on wet surfaces while also drying them." icon_state = "galoshes_dry" -/obj/item/clothing/shoes/galoshes/dry/lightweight /// for red janitor ert. +/// / for red janitor ert. +/obj/item/clothing/shoes/galoshes/dry/lightweight name = "lightweight absorbent galoshes" desc = "A pair of expensive looking lightweight rubber boots, designed to prevent slipping on wet surfaces while also drying them." slowdown = NONE diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm index 47c2b602ff78..7250245bbeb2 100644 --- a/code/modules/clothing/suits/armor_suits.dm +++ b/code/modules/clothing/suits/armor_suits.dm @@ -648,7 +648,8 @@ disable(rand(2, 5)) return TRUE -/obj/item/clothing/suit/armor/reactive/random //Spawner for random reactive armor +/// Spawner for random reactive armor +/obj/item/clothing/suit/armor/reactive/random name = "Random Reactive Armor" /obj/item/clothing/suit/armor/reactive/random/Initialize(mapload) diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 1165ab500570..648694fa4e27 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -173,7 +173,7 @@ dog_fashion = /datum/dog_fashion/back /obj/item/clothing/suit/corgisuit/en - name = "\improper super-hero E-N suit" + name = "super-hero E-N suit" icon_state = "ensuit" /obj/item/clothing/suit/corgisuit/super_hero @@ -182,7 +182,7 @@ flags = NODROP /obj/item/clothing/suit/corgisuit/super_hero/en - name = "\improper super-hero E-N suit" + name = "super-hero E-N suit" icon_state = "ensuit" /obj/item/clothing/suit/corgisuit/super_hero/en/Initialize(mapload) @@ -325,7 +325,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/hooded/bee_costume // It's Hip! +/// It's Hip! +/obj/item/clothing/suit/hooded/bee_costume name = "bee costume" desc = "Bee the true Queen!" icon_state = "bee" @@ -344,14 +345,16 @@ flags_inv = HIDEEARS sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi') -/obj/item/clothing/suit/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? +/// OH MY GOD WHAT HAVE YOU DONE!?!?!? +/obj/item/clothing/suit/bloated_human name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" item_state = "lingspacesuit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS -/obj/item/clothing/suit/draculacoat // Bleh! +/// Bleh! +/obj/item/clothing/suit/draculacoat name = "transylvanian coat" desc = "What is a spessman? A miserable little pile of secrets." icon_state = "draculacoat" diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index a2f3d90fb155..6b17ad572364 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -133,7 +133,8 @@ icon_state = "horribletie" item_color = "horribletie" -/obj/item/clothing/accessory/waistcoat // No overlay +/// No overlay +/obj/item/clothing/accessory/waistcoat name = "waistcoat" desc = "For some classy, murderous fun." icon_state = "waistcoat" @@ -311,7 +312,8 @@ desc = "An award issued by the Quartermaster to supply staff dedicated to being effective." channel = "Supply" -/obj/item/clothing/accessory/medal/recruiter // Prize for the NT Recruiter emagged arcade +/// Prize for the NT Recruiter emagged arcade +/obj/item/clothing/accessory/medal/recruiter name = "nanotrasen recruiter medal" desc = "A prize for those who completed the company's most difficult training, use it to earn the respect of everyone in human resources." @@ -367,7 +369,8 @@ desc = "An award which represents magnificant contributions to the HRD-MDE project in the form of analysing Bubblegum, and the related blood space." channel = null -/obj/item/clothing/accessory/medal/gold/heroism/hardmode_full //Kill every hardmode boss. In a shift. Good luck. +/// Kill every hardmode boss. In a shift. Good luck. +/obj/item/clothing/accessory/medal/gold/heroism/hardmode_full name = "medal of incredible dedication" desc = "An extremely rare golden medal awarded only by CentComm. This medal was issued for miners who went above and beyond for the HRD-MDE project. Engraved on it is the phrase 'mori quam foedari'..." channel = null @@ -493,7 +496,8 @@ //SCARVES// /////////// -/obj/item/clothing/accessory/scarf // No overlay +/// No overlay +/obj/item/clothing/accessory/scarf name = "scarf" desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks." dog_fashion = /datum/dog_fashion/head diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 255e7432b884..33dc2ab3c39f 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -125,7 +125,8 @@ item_state = "p_suit" item_color = "purple" -/obj/item/clothing/under/color/purple/sensor //for jani ert +/// for jani ert +/obj/item/clothing/under/color/purple/sensor sensor_mode = SENSOR_COORDS random_sensor = FALSE diff --git a/code/modules/clothing/under/costumes.dm b/code/modules/clothing/under/costumes.dm index 7a851e438398..775802ef24d7 100644 --- a/code/modules/clothing/under/costumes.dm +++ b/code/modules/clothing/under/costumes.dm @@ -138,7 +138,8 @@ item_state = "psyamp" item_color = "psyamp" -/obj/item/clothing/under/psysuit //Don't modify the path, used by a fluff item +/// Don't modify the path, used by a fluff item +/obj/item/clothing/under/psysuit name = "dark undersuit" desc = "A thick, layered grey undersuit lined with power cables. Feels a little like wearing an electrical storm." icon_state = "psysuit" diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm index 8dedff438e19..7a8258f77c0c 100644 --- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm @@ -149,7 +149,8 @@ item_state = "psychturtle" item_color = "psychturtle" -/obj/item/clothing/under/rank/medical/gown //Seems like it should be here for organisational purposes +/// Seems like it should be here for organisational purposes +/obj/item/clothing/under/rank/medical/gown name = "medical gown" desc = "a flimsy examination gown, the back ties never close." icon_state = "medicalgown" diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 2b41fbf63bee..e4d0b3b0d8b6 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -28,84 +28,84 @@ var/outcome /obj/item/weaponcrafting/gunkit/nuclear - name = "\improper advanced energy gun parts kit" + name = "advanced energy gun parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into an advanced energy gun." origin_tech = "combat=4;magnets=4;powerstorage=4" outcome = /obj/item/gun/energy/gun/nuclear /obj/item/weaponcrafting/gunkit/tesla - name = "\improper arc revolver parts kit" + name = "arc revolver parts kit" desc = "A suitcase containing the necessary gun parts to construct a arc revolver around a laser rifle. Handle with care." origin_tech = "combat=5;materials=5;powerstorage=5" outcome = /obj/item/gun/energy/arc_revolver /obj/item/weaponcrafting/gunkit/xray - name = "\improper x-ray laser gun parts kit" + name = "x-ray laser gun parts kit" desc = "A suitcase containing the necessary gun parts to turn a laser gun into a x-ray laser gun. Do not point most parts directly towards face." origin_tech = "combat=6;materials=4;magnets=4;syndicate=1" outcome = /obj/item/gun/energy/xray /obj/item/weaponcrafting/gunkit/ion - name = "\improper ion carbine parts kit" + name = "ion carbine parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into a ion carbine." origin_tech = "combat=4;magnets=4" outcome = /obj/item/gun/energy/ionrifle/carbine /obj/item/weaponcrafting/gunkit/temperature - name = "\improper temperature gun parts kit" + name = "temperature gun parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenious populations of Ash Walkers." origin_tech = "combat=4;materials=4;powerstorage=3;magnets=2" outcome = /obj/item/gun/energy/temperature /obj/item/weaponcrafting/gunkit/decloner - name = "\improper decloner parts kit" + name = "decloner parts kit" desc = "An uttery baffling array of gun parts and technology that somehow turns an energy gun into a decloner. Haircut not included." origin_tech = "combat=4;materials=4;biotech=5;plasmatech=6" outcome = /obj/item/gun/energy/decloner /obj/item/weaponcrafting/gunkit/ebow - name = "\improper energy crossbow parts kit" + name = "energy crossbow parts kit" desc = "Highly illegal weapons refurbishment kit that allows you to turn a laser gun into a near-duplicate energy crossbow. Almost like the real thing!" origin_tech = "combat=4;magnets=4;syndicate=2" outcome = /obj/item/gun/energy/kinetic_accelerator/crossbow/large /obj/item/weaponcrafting/gunkit/immolator - name = "\improper immolator laser gun parts kit" + name = "immolator laser gun parts kit" desc = "Take a perfectly functioning laser gun. Butcher the inside of the gun so it runs hot and mean. You now have a immolator laser. You monster." origin_tech = "combat=4;magnets=4;powerstorage=3" outcome = /obj/item/gun/energy/immolator /obj/item/weaponcrafting/gunkit/accelerator - name = "\improper accelerator laser cannon parts kit" + name = "accelerator laser cannon parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard laser gun into an accelerator laser cannon." origin_tech = "combat=4;magnets=4;powerstorage=3" outcome = /obj/item/gun/energy/lasercannon /obj/item/weaponcrafting/gunkit/lwap - name = "\improper lwap laser sniper parts kit" + name = "lwap laser sniper parts kit" desc = "A suitcase containing the necessary gun parts to transform an laser gun into an advanced piercing laser sniper. Now with wall hacks!" origin_tech = "combat=6;magnets=6;powerstorage=4" outcome = /obj/item/gun/energy/lwap /obj/item/weaponcrafting/gunkit/plasma - name = "\improper plasma pistol parts kit" + name = "plasma pistol parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard laser gun into a plasma pistol. Wort, wort, wort!" origin_tech = "combat=4;magnets=4;powerstorage=3" outcome = /obj/item/gun/energy/plasma_pistol /obj/item/weaponcrafting/gunkit/u_ionsilencer - name = "\improper u-ion silencer parts kit" + name = "u-ion silencer parts kit" desc = "A suitcase containing the necessary gun parts to transform a standard disabler into a silenced and lethal disabling weapon. Look officer, he has no wounds from me!" origin_tech = "combat=6;magnets=6;syndicate=2" outcome = /obj/item/gun/energy/disabler/silencer /obj/item/weaponcrafting/gunkit/universal_gun_kit - name = "\improper universal self assembling gun parts kit" + name = "universal self assembling gun parts kit" desc = "A suitcase containing the necessary gun parts to build a full gun, when combined with a gun kit. Use it directly on a gunkit to rapidly assemble it." icon_state = "syndicase" /obj/item/weaponcrafting/gunkit/universal_gun_kit/sol_gov - name = "\improper sol gov universal self assembling gun parts kit" + name = "sol gov universal self assembling gun parts kit" icon_state = "solcase" //Ikea reference pending. /obj/item/weaponcrafting/gunkit/universal_gun_kit/afterattack(obj/item/weaponcrafting/gunkit/gunkit_to_use, mob/user, flag) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 27a767271d6f..e178aa0c44e5 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -818,7 +818,8 @@ category = CAT_PRIMAL alert_admins_on_craft = TRUE -/datum/crafting_recipe/rake //Category resorting incoming +/// Category resorting incoming +/datum/crafting_recipe/rake name = "Rake" time = 30 reqs = list(/obj/item/stack/sheet/wood = 5) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index afa07900913f..690d19e63030 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -16,7 +16,8 @@ /obj/item/fluff var/used = FALSE -/obj/item/fluff/tattoo_gun // Generic tattoo gun, make subtypes for different folks +/// Generic tattoo gun, make subtypes for different folks +/obj/item/fluff/tattoo_gun name = "disposable tattoo pen" desc = "A cheap plastic tattoo application pen." icon = 'icons/obj/custom_items.dmi' @@ -112,7 +113,8 @@ else to_chat(user, "[src] is out of ink!") -/obj/item/fluff/bird_painter // BirdtTalon: Kahkiri +/// BirdtTalon: Kahkiri +/obj/item/fluff/bird_painter name = "Orb of Onyx" desc = "It is imbued with such dark power as to corrupt the very appearance of those who gaze into its depths." icon_state = "bird_orb" @@ -126,7 +128,8 @@ to_chat(user, "You use [src] on yourself.") qdel(src) -/obj/item/claymore/fluff // MrBarrelrolll: Maximus Greenwood +/// MrBarrelrolll: Maximus Greenwood +/obj/item/claymore/fluff name = "Greenwood's Blade" desc = "A replica claymore with strange markings scratched into the blade." force = 5 @@ -135,7 +138,8 @@ /obj/item/claymore/fluff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 -/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki Atan +/// Xydonus: Rsik Ugsharki Atan +/obj/item/fluff/rsik_katana name = "ceremonial katana" desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile." icon = 'icons/obj/custom_items.dmi' @@ -156,31 +160,36 @@ user.visible_message("[user] tries to stab [src] into [user.p_their()] stomach! Except [src] shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.") return BRUTELOSS -/obj/item/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley +/// Zomgponies: Griffin Rowley +/obj/item/crowbar/fluff/zelda_creedy_1 name = "Zelda's Crowbar" desc = "A pink crowbar that has an engraving that reads, 'To Zelda. Love always, Dawn'" icon = 'icons/obj/custom_items.dmi' icon_state = "zeldacrowbar" item_state = "crowbar" -/obj/item/clothing/glasses/monocle/fluff/trubus //Trubus: Wolf O'Shaw +/// Trubus: Wolf O'Shaw +/obj/item/clothing/glasses/monocle/fluff/trubus name = "Gold Thermal Eyepatch" desc = "Wolf's non-functional thermal eyepatch." icon = 'icons/obj/custom_items.dmi' icon_state = "wolf_eyepatch" -/obj/item/clothing/glasses/meson/fluff/book_berner_1 // Adrkiller59: Adam Cooper +/// Adrkiller59: Adam Cooper +/obj/item/clothing/glasses/meson/fluff/book_berner_1 name = "bespectacled mesonic surveyors" desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts." icon = 'icons/obj/custom_items.dmi' icon_state = "book_berner_1" -/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki //Rapidvalj: Kakicharakiti +/// Rapidvalj: Kakicharakiti +/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki name = "broken thermonocle" desc = "A weathered Vox thermonocle, doesn't seem to work anymore." icon_state = "thermoncle" -/obj/item/fluff/rapid_wheelchair_kit //Rapidvalj: Hakikarahiti +/// Rapidvalj: Hakikarahiti +/obj/item/fluff/rapid_wheelchair_kit name = "wheelchair conversion kit" desc = "An assorted set of exchangable parts for a wheelchair." icon_state = "modkit" @@ -208,31 +217,36 @@ desc = "A custom made zippo lighter." icon = 'icons/obj/custom_items.dmi' -/obj/item/lighter/zippo/fluff/purple // GodOfOreos: Jason Conrad +/// GodOfOreos: Jason Conrad +/obj/item/lighter/zippo/fluff/purple name = "purple engraved zippo" desc = "All craftsspacemanship is of the highest quality. It is encrusted with refined plasma sheets. On the item is an image of a dwarf and the words 'Strike the Earth!' etched onto the side." icon_state = "zippo-purple" item_state = "zippo-purple" -/obj/item/lighter/zippo/fluff/michael_guess_1 // mrbits: Callista Gold +/// mrbits: Callista Gold +/obj/item/lighter/zippo/fluff/michael_guess_1 name = "engraved lighter" desc = "A golden lighter, engraved with some ornaments and a G." icon_state = "zippo-guess" item_state = "zippo-gold" -/obj/item/lighter/zippo/fluff/duckchan // Duckchan: Rybys Romney +/// Duckchan: Rybys Romney +/obj/item/lighter/zippo/fluff/duckchan name = "Monogrammed Zippo" desc = " A shiny purple zippo lighter, engraved with Rybys Romney and BuzzPing's name, with a festive green flame." icon_state = "zippo-duckchan" item_state = "zippo-purple" -/obj/item/lighter/zippo/fluff/warriorstar // Warriorstar: DEADLOCK +/// Warriorstar: DEADLOCK +/obj/item/lighter/zippo/fluff/warriorstar name = "zippo" desc = "The lighter is made of a pastel purple metal which seems to glimmer even in complete darkness." icon_state = "zippo-warriorstar" item_state = "zippo-purple" -/obj/item/fluff/dogwhistle //phantasmicdream: Zeke Varloss +/// phantasmicdream: Zeke Varloss +/obj/item/fluff/dogwhistle name = "Sax's whistle" desc = "This whistle seems to have a strange aura about it. Maybe you should blow on it?" icon = 'icons/obj/custom_items.dmi' @@ -256,7 +270,8 @@ user.drop_item() qdel(src) -/obj/item/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad +/// godoforeos: Jason Conrad +/obj/item/storage/toolbox/fluff/lunchbox name = "lunchpail" desc = "A simple black lunchpail." icon = 'icons/obj/custom_items.dmi' @@ -297,7 +312,8 @@ to_chat(target, "You comb your tail with [src].") used = TRUE -/obj/item/fluff/desolate_coat_kit //DesolateG: Micheal Smith +/// DesolateG: Micheal Smith +/obj/item/fluff/desolate_coat_kit name = "armored jacket conversion kit" desc = "Flaps of dark fabric, probably used to somehow modify some sort of an armored garment. Won't help with protection, though." icon_state = "modkit" @@ -328,7 +344,8 @@ user.update_inv_wear_suit() qdel(src) -/obj/item/fluff/fei_gasmask_kit //Fei Hazelwood: Tariq Yon-Dale +/// Fei Hazelwood: Tariq Yon-Dale +/obj/item/fluff/fei_gasmask_kit name = "gas mask conversion kit" desc = "A gas mask conversion kit." icon_state = "modkit" @@ -354,7 +371,8 @@ to_chat(user, "You can't modify [target]!") -/obj/item/fluff/desolate_baton_kit //DesolateG: Micheal Smith +/// DesolateG: Micheal Smith +/obj/item/fluff/desolate_baton_kit name = "stun baton conversion kit" desc = "Some sci-fi looking parts for a stun baton." icon = 'icons/obj/custom_items.dmi' @@ -380,7 +398,8 @@ to_chat(user, "You can't modify [target]!") -/obj/item/fluff/cardgage_helmet_kit //captain cardgage: Richard Ulery +/// captain cardgage: Richard Ulery +/obj/item/fluff/cardgage_helmet_kit name = "welding helmet modkit" desc = "Some spraypaint and a stencil, perfect for painting flames onto a welding helmet!" icon_state = "modkit" @@ -402,7 +421,8 @@ return to_chat(user, "You can't modify [target]!") -/obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with +/// Travelling Merchant: Trav Noble. This is what they spawn in with +/obj/item/fluff/merchant_sallet_modkit name = "SG Helmet modkit" desc = "A modkit that can make most helmets look like a Shellguard Helmet." icon_state = "modkit" @@ -445,7 +465,8 @@ else to_chat(user, "You can't modify [target]!") -/obj/item/fluff/k3_webbing_modkit //IK3I: Yakikatachi +/// IK3I: Yakikatachi +/obj/item/fluff/k3_webbing_modkit name = "webbing modkit" desc = "A modkit that can be used to turn certain vests and labcoats into lightweight webbing" icon_state = "modkit" @@ -470,7 +491,8 @@ to_chat(user, "You can't modify [target]!") // These two fluff items are commented out due to the transfer to MODsuits breaking these. Sprites are still in custom_items.dmi , but they need a resprite to work with MODsuits. -/obj/item/fluff/pyro_wintersec_kit //DarkLordpyro: Valthorne Haliber +/// DarkLordpyro: Valthorne Haliber +/obj/item/fluff/pyro_wintersec_kit name = "winter sec conversion kit" desc = "A securirty hardsuit conversion kit." icon_state = "modkit" @@ -523,7 +545,8 @@ to_chat(user, "You can't modify [target]!") */ -/obj/item/fluff/sylus_conversion_kit //Decemviri: Sylus Cain +/// Decemviri: Sylus Cain +/obj/item/fluff/sylus_conversion_kit name = "cerberus pattern conversion kit" desc = "A securirty hardsuit conversion kit." icon_state = "modkit" @@ -589,53 +612,61 @@ //////////// Gloves ////////////// //////////// Eye Wear //////////// -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro //T0EPIC4U: Ty Omaha +/// T0EPIC4U: Ty Omaha +/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro name = "Tacticool EyePro" desc = "Tacticool ballistic glasses, for making all operators look badass." icon = 'icons/obj/custom_items.dmi' icon_state = "eyepro" item_state = "eyepro" -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/voxxyhud //LP Spartan: Kaskreyarawkta +/// LP Spartan: Kaskreyarawkta +/obj/item/clothing/glasses/hud/security/sunglasses/fluff/voxxyhud name = "VoxxyHUD" desc = "A worn down visor from a vox raider's gear, crudely ripped from its helmet and linked into the security systems of the station. The word 'Kask' is scratched into the side." icon = 'icons/obj/custom_items.dmi' icon_state = "hud-spartan" //////////// Hats //////////// -/obj/item/clothing/head/fluff/heather_winceworth // Regens: Heather Winceworth +/// Regens: Heather Winceworth +/obj/item/clothing/head/fluff/heather_winceworth name= "Heather's rose" desc= "A beautiful purple rose for your hair." icon= 'icons/obj/custom_items.dmi' icon_state = "hairflowerp" item_state = "hairflowerp" -/obj/item/clothing/head/valkyriehelmet //R3Valkyrie: Rikki +/// R3Valkyrie: Rikki +/obj/item/clothing/head/valkyriehelmet name = "charred visor" desc = "A visor of alien origin, charred by fire and completely non-functioning. It's been impeccably polished, shiny!" icon = 'icons/obj/custom_items.dmi' icon_state = "charred_visor" species_restricted = list("Vox") -/obj/item/clothing/head/bearpelt/fluff/polar //Gibson1027: Sploosh +/// Gibson1027: Sploosh +/obj/item/clothing/head/bearpelt/fluff/polar name = "polar bear pelt hat" desc = "Fuzzy, and also stained with blood." icon = 'icons/obj/custom_items.dmi' icon_state = "polarbearpelt" -/obj/item/clothing/head/fluff/sparkyninja_beret // Sparkyninja: Neil Wilkinson +/// Sparkyninja: Neil Wilkinson +/obj/item/clothing/head/fluff/sparkyninja_beret name = "royal marines commando beret" desc = "Dark Green beret with an old insignia on it." icon = 'icons/obj/custom_items.dmi' icon_state = "sparkyninja_beret" -/obj/item/clothing/head/beret/fluff/sigholt //sigholtstarsong: Sigholt Starsong +/// sigholtstarsong: Sigholt Starsong +/obj/item/clothing/head/beret/fluff/sigholt name = "Lieutenant Starsong's beret" desc = "This beret bears insignia of the SOLGOV Marine Corps 417th Regiment, 2nd Battalion, Bravo Company. It looks meticulously maintained." icon_state = "beret_hos" item_state = "beret_hos" -/obj/item/clothing/head/pirate/fluff/stumpy //MrFroztee: Stumpy +/// MrFroztee: Stumpy +/obj/item/clothing/head/pirate/fluff/stumpy name = "The Sobriety Skullcap" desc = "A hat suited for the king of the pirates" icon_state = "pirate" @@ -655,19 +686,22 @@ if(H.head == src) H.Slur(6 SECONDS) //always slur -/obj/item/clothing/head/beret/fluff/linda //Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/head/beret/fluff/linda name = "Green beret" desc = "A beret, an artist's favorite headwear. This one has two holes cut on the edges." icon = 'icons/obj/custom_items.dmi' icon_state = "linda_beret" -/obj/item/clothing/head/fluff/kaki //Rapidvalj: Kakicharakiti +/// Rapidvalj: Kakicharakiti +/obj/item/clothing/head/fluff/kaki name = "sleek fancy leader hat" desc = "A uniquely colored vox leader hat. Has some signs of wear." icon = 'icons/obj/custom_items.dmi' icon_state = "kakicharakiti" -/obj/item/clothing/head/helmet/fluff/merchant_sallet //Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with +/// Travelling Merchant: Trav Noble. This >>IS NOT<< what they spawn in with +/obj/item/clothing/head/helmet/fluff/merchant_sallet name = "Shellguard Helmet" desc = "A Shellguard Helmet with the name Noble written on the inside." icon = 'icons/obj/custom_items.dmi' @@ -715,7 +749,8 @@ user.update_inv_head() return 1 -/obj/item/clothing/head/beret/fluff/elo //V-Force_Bomber: E.L.O. +/// V-Force_Bomber: E.L.O. +/obj/item/clothing/head/beret/fluff/elo name = "E.L.O.'s medical beret" desc = "E.L.O.s personal medical beret, issued by Nanotrassen and awarded along with her medal." icon = 'icons/obj/custom_items.dmi' @@ -729,7 +764,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat //ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. +/// ozewse : Daniel Harper : Donated to them by Runemeds, who is the original donor. +/obj/item/clothing/suit/storage/labcoat/fluff/pulsecoat name = "EMT pulse coat" desc = "An EMT labcoat modified to track the wearer's heartbeat. It's so worn out that it doesn't seem to accurately track heartbeat anymore. Also, the zipper is stuck." icon = 'icons/obj/custom_items.dmi' @@ -738,7 +774,8 @@ ignore_suitadjust = 1 actions_types = list() -/obj/item/clothing/suit/jacket/miljacket/patch // sniper_fairy : P.A.T.C.H. +/// sniper_fairy : P.A.T.C.H. +/obj/item/clothing/suit/jacket/miljacket/patch name = "custom purple military jacket" desc = "A canvas jacket styled after classical American military garb. Feels sturdy, yet comfortable. This one has a medical patch on it." icon = 'icons/obj/custom_items.dmi' @@ -785,20 +822,23 @@ . = ..() -/obj/item/clothing/suit/fluff/dusty_jacket //ComputerlessCitizen: Screech +/// ComputerlessCitizen: Screech +/obj/item/clothing/suit/fluff/dusty_jacket name = "Dusty Jacket" desc = "A worn leather jacket. Some burn holes have been patched." body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS icon_state = "dusty_jacket" -/obj/item/clothing/suit/fluff/cheeky_sov_coat //CheekyCrenando: Srusu Rskuzu +/// CheekyCrenando: Srusu Rskuzu +/obj/item/clothing/suit/fluff/cheeky_sov_coat name = "Srusu's Greatcoat" desc = "A heavy wool Soviet-style greatcoat. A name is written in fancy handwriting on the inside tag: Srusu Rskuzu" icon = 'icons/obj/custom_items.dmi' item_state = "cheeky_sov_coat" icon_state = "cheeky_sov_coat" -/obj/item/clothing/suit/fluff/supplymaster_jacket //Denthamos: Henry Grandpa Gadow +/// Denthamos: Henry Grandpa Gadow +/obj/item/clothing/suit/fluff/supplymaster_jacket name = "faded NT Supply Master's Coat" desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it." icon_state = "supplymaster_jacket_open" @@ -811,14 +851,16 @@ actions_types = list(/datum/action/item_action/button) adjust_flavour = "unbutton" -/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Socialsystem: Lynn Fea +/// Socialsystem: Lynn Fea +/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil name = "Robotics labcoat" desc = "A labcoat with a few markings denoting it as the labcoat of roboticist." icon = 'icons/obj/custom_items.dmi' icon_state = "aeneasrinil_open" sprite_sheets = null -/obj/item/clothing/suit/jacket/fluff/kidosvest // Anxipal: Kido Qasteth +/// Anxipal: Kido Qasteth +/obj/item/clothing/suit/jacket/fluff/kidosvest name = "Kido's Vest" desc = "A rugged leather vest with a tag labelled \"Men of Mayhem.\"" icon = 'icons/obj/custom_items.dmi' @@ -829,7 +871,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/jacket/fluff/jacksvest // Anxipal: Jack Harper +/// Anxipal: Jack Harper +/obj/item/clothing/suit/jacket/fluff/jacksvest name = "Jack's vest" desc = "A rugged leather vest with a tag labelled \"President\"." icon = 'icons/obj/custom_items.dmi' @@ -839,7 +882,8 @@ adjust_flavour = null sprite_sheets = null -/obj/item/clothing/suit/fluff/kluys // Kluys: Cripty Pandaen +/// Kluys: Cripty Pandaen +/obj/item/clothing/suit/fluff/kluys name = "Nano Fibre Jacket" desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials." icon = 'icons/obj/custom_items.dmi' @@ -870,38 +914,44 @@ return usr.update_inv_wear_suit() -/obj/item/clothing/suit/storage/labcoat/fluff/red // Sweetjealousy: Sophie Faust-Noms +/// Sweetjealousy: Sophie Faust-Noms +/obj/item/clothing/suit/storage/labcoat/fluff/red name = "red labcoat" desc = "A suit that protects against minor chemical spills. Has a red stripe on the shoulders and rolled up sleeves." icon = 'icons/obj/custom_items.dmi' icon_state = "labcoat_red_open" sprite_sheets = null -/obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat // Ionward: Gemini +/// Ionward: Gemini +/obj/item/clothing/suit/storage/labcoat/fluff/ionward_labcoat name = "Technocracy labcoat" desc = "A thin, faded, carbon fiber labcoat. On the back, a Technocracy vessel's logo. Inside, the name 'Gemini' is printed on the collar." icon = 'icons/obj/custom_items.dmi' icon_state = "ionward_labcoat_open" sprite_sheets = null -/obj/item/clothing/suit/fluff/stobarico_greatcoat // Stobarico: F.U.R.R.Y +/// Stobarico: F.U.R.R.Y +/obj/item/clothing/suit/fluff/stobarico_greatcoat name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat" desc = "A greatcoat with Nanotrasen colors." icon = 'icons/obj/custom_items.dmi' icon_state = "stobarico_jacket" -/obj/item/clothing/suit/hooded/hoodie/fluff/linda // Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/suit/hooded/hoodie/fluff/linda name = "Green Nanotrasen Hoodie" desc = "A green hoodie with the Nanotrasen logo on the back. It looks weathered." icon = 'icons/obj/custom_items.dmi' icon_state = "linda_hoodie" hoodtype = /obj/item/clothing/head/hooded/hood/fluff/linda -/obj/item/clothing/head/hooded/hood/fluff/linda //Epic_Charger: Linda Clark +/// Epic_Charger: Linda Clark +/obj/item/clothing/head/hooded/hood/fluff/linda icon_state = "greenhood" -/obj/item/clothing/suit/hooded/hoodie/hylo //Hylocereus: Sam Aria +/// Hylocereus: Sam Aria +/obj/item/clothing/suit/hooded/hoodie/hylo name = "worn assymetrical hoodie" desc = "A soft, cozy longline hoodie. It looks old and worn, but well cared for. There's no label, but a series of dates and names is penned on a scrap of fabric sewn on the inside of the left side of the chest - 'Sam Aria' is scrawled atop them all, next to the words 'Please Remember'." icon = 'icons/obj/custom_items.dmi' @@ -912,7 +962,8 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "sam_hood" -/obj/item/clothing/suit/hooded/fluff/bone //Doru7: Jack Bone +/// Doru7: Jack Bone +/obj/item/clothing/suit/hooded/fluff/bone name = "skeleton suit" desc = "A spooky full-body suit! This one doesn't glow in the dark." body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -924,7 +975,8 @@ icon = 'icons/obj/custom_items.dmi' icon_state = "skeleton_hood" -/obj/item/clothing/suit/armor/shodanscoat // RazekPraxis: SHODAN +/// RazekPraxis: SHODAN +/obj/item/clothing/suit/armor/shodanscoat name = "SHODAN's Captain's Coat" desc = "A black coat with gold trim and an old US Chevron printed on the back. Edgy." icon = 'icons/obj/custom_items.dmi' @@ -962,7 +1014,8 @@ to_chat(user, "You turn [src]'s lighting system [flavour].") user.update_inv_wear_suit() -/obj/item/clothing/suit/hooded/hoodie/fluff/xantholne // Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/suit/hooded/hoodie/fluff/xantholne name = "stripped winter coat" desc = "A velvety smooth black winter coat with white and red stripes on the side." icon = 'icons/obj/custom_items.dmi' @@ -972,7 +1025,8 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) -/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/head/hooded/hood/fluff/xantholne name = "black winter hood" desc = "A black hood attached to a stripped winter coat." icon = 'icons/obj/custom_items.dmi' @@ -981,7 +1035,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) +/// Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) +/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus name = "custom fit bomber jacket" desc = "Made for Unathi who likes to show off their big horns." icon = 'icons/obj/custom_items.dmi' @@ -1001,12 +1056,14 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/fluff/pineapple //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/clothing/suit/fluff/pineapple name = "red trench coat" desc = "A red coat with cheaply made plastic accessories." icon_state = "pineapple_trench" -/obj/item/fluff/pinapplehairgel ////Pineapple Salad: Dan Jello +/// //Pineapple Salad: Dan Jello +/obj/item/fluff/pinapplehairgel name = "slime hair gel" desc = "A bottle containing extra..material..for custom 'hair' styling." icon = 'icons/obj/custom_items.dmi' @@ -1027,7 +1084,8 @@ -/obj/item/clothing/suit/hooded/wintercoat/fluff/shesi //MrSynnester : Shesi Skaklas +/// MrSynnester : Shesi Skaklas +/obj/item/clothing/suit/hooded/wintercoat/fluff/shesi name = "custom made winter coat" desc = "A custom made winter coat with the arms removed. Looks comfy." icon = 'icons/obj/custom_items.dmi' @@ -1037,7 +1095,8 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO cold_protection = UPPER_TORSO|LOWER_TORSO -/obj/item/clothing/head/hooded/hood/fluff/shesi //MrSynnester : Shesi Skaklas +/// MrSynnester : Shesi Skaklas +/obj/item/clothing/head/hooded/hood/fluff/shesi name = "custom made winter hood" desc = "A custom made winter coat hood. Looks comfy." icon = 'icons/obj/custom_items.dmi' @@ -1046,7 +1105,8 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/suit/jacket/dtx //AffectedArc07: DTX +/// AffectedArc07: DTX +/obj/item/clothing/suit/jacket/dtx name = "telecommunications bomber jacket" desc = "Looks like something only a nerd would buy. Has a tag inside reading Property of DTX." icon = 'icons/obj/custom_items.dmi' @@ -1070,7 +1130,8 @@ "Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi' ) -/obj/item/clothing/under/fluff/counterfeitguise_uniform // thatdanguy23 : Rissa Williams +/// thatdanguy23 : Rissa Williams +/obj/item/clothing/under/fluff/counterfeitguise_uniform icon = 'icons/obj/custom_items.dmi' name = "Rissa's hand-me-downs" desc = "An old, hand-me-down baggy sweater and sweatpants combo. A label on the neck reads 'RISSA' in scruffy handwriting." @@ -1080,7 +1141,8 @@ item_state = "counterfeitguise" item_color = "counterfeitguise" -/obj/item/clothing/under/fluff/benjaminfallout // Benjaminfallout: Pretzel Brassheart +/// Benjaminfallout: Pretzel Brassheart +/obj/item/clothing/under/fluff/benjaminfallout icon = 'icons/obj/custom_items.dmi' name = "Pretzel's dress" desc = "A nice looking dress" @@ -1088,7 +1150,8 @@ item_state = "fallout_dress" item_color = "fallout_dress" -/obj/item/clothing/under/fluff/soviet_casual_uniform // Norstead : Natalya Sokolova +/// Norstead : Natalya Sokolova +/obj/item/clothing/under/fluff/soviet_casual_uniform icon = 'icons/obj/custom_items.dmi' name = "Soviet Casual Uniform" desc = "Female U.S.S.P. casual wear. Dlya Rodiny!" @@ -1096,7 +1159,8 @@ item_state = "soviet_casual_uniform" item_color = "soviet_casual_uniform" -/obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile +/// Kharshai: Athena Castile +/obj/item/clothing/under/fluff/kharshai name = "Castile formal outfit" desc = "A white and gold formal uniform, accompanied by a small pin with the numbers '004' etched upon it." icon = 'icons/obj/custom_items.dmi' @@ -1104,7 +1168,8 @@ item_state = "castile_dress" item_color = "castile_dress" -/obj/item/clothing/under/fluff/xantholne //Xantholne: Meex Zwichsnicrur +/// Xantholne: Meex Zwichsnicrur +/obj/item/clothing/under/fluff/xantholne name = "Stripped Shorts and Shirt" desc = "A silky pair of dark shorts with a matching shirt. The shirt's collar has a tag on the inside that reads 'Meexy' on it." icon = 'icons/obj/custom_items.dmi' @@ -1114,7 +1179,8 @@ item_state = "xantholne" item_color = "xantholne" -/obj/item/clothing/under/fluff/elishirt // FlattestGuitar9: Eli Randolph +/// FlattestGuitar9: Eli Randolph +/obj/item/clothing/under/fluff/elishirt name = "casual dress shirt" desc = "A soft, white dress shirt paired up with black suit pants. The set looks comfortable." icon = 'icons/obj/custom_items.dmi' @@ -1123,7 +1189,8 @@ item_color = "elishirt" displays_id = FALSE -/obj/item/clothing/under/fluff/jay_turtleneck // Jayfeather: Jay Wingler +/// Jayfeather: Jay Wingler +/obj/item/clothing/under/fluff/jay_turtleneck name = "Mar's Pattern Custom Turtleneck" desc = "It seems to be lightly dusted in orange fuzz, and damp with the smell of anti-freeze. It has a strange symbol in the middle." icon = 'icons/obj/custom_items.dmi' @@ -1132,11 +1199,13 @@ item_color = "jaywingler" displays_id = FALSE -/obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 // Xilia: Isaca Sirius +/// Xilia: Isaca Sirius +/obj/item/clothing/under/psysuit/fluff/isaca_sirius_1 name = "Isaca's suit" desc = "Black, comfortable and nicely fitting suit. Made not to hinder the wearer in any way. Made of some exotic fabric. And some strange glowing jewel at the waist. Name labels says; Property of Isaca Sirius; The Seeder." -/obj/item/clothing/under/fluff/jane_sidsuit // SyndiGirl: Zoey Scyth +/// SyndiGirl: Zoey Scyth +/obj/item/clothing/under/fluff/jane_sidsuit name = "NT-SID jumpsuit" desc = "A Nanotrasen Synthetic Intelligence Division jumpsuit, issued to 'volunteers'. On other people it looks fine, but right here a scientist has noted: on you it looks stupid." icon = 'icons/obj/custom_items.dmi' @@ -1164,7 +1233,8 @@ src.item_state = "[item_color]" usr.update_inv_w_uniform() -/obj/item/clothing/under/fluff/honourable // MrBarrelrolll: Maximus Greenwood +/// MrBarrelrolll: Maximus Greenwood +/obj/item/clothing/under/fluff/honourable name = "Viridi Protegat" desc = "A set of chainmail adorned with a hide mantle. \"Greenwood\" is engraved into the right breast." icon = 'icons/obj/clothing/under/costumes.dmi' @@ -1174,7 +1244,8 @@ displays_id = FALSE strip_delay = 100 -/obj/item/clothing/under/fluff/aegis //PlagueWalker: A.E.G.I.S. +/// PlagueWalker: A.E.G.I.S. +/obj/item/clothing/under/fluff/aegis name = "gilded waistcoat" desc = "This black, gold-trimmed, rather expensive-looking uniform laced with fine materials appears comfortable despite its stiffness." icon = 'icons/obj/custom_items.dmi' @@ -1185,7 +1256,8 @@ item_color = "aegisuniform" displays_id = FALSE -/obj/item/clothing/under/fluff/elo_turtleneck // vforcebomber: E.L.O. +/// vforcebomber: E.L.O. +/obj/item/clothing/under/fluff/elo_turtleneck name = "E.L.O's Turtleneck" desc = "This TurtleNeck belongs to the IPC E.L.O. And has her name sown into the upper left breast, a very wooly jumper." icon = 'icons/obj/custom_items.dmi' // for the floor sprite @@ -1195,13 +1267,15 @@ //////////// Masks //////////// -/obj/item/clothing/mask/bandana/fluff/dar //sasanek12: Dar'Konr +/// sasanek12: Dar'Konr +/obj/item/clothing/mask/bandana/fluff/dar name = "camo bandana" desc = "It's a worn-out bandana in camo paint" icon = 'icons/obj/custom_items.dmi' icon_state = "bandcamo" -/obj/item/clothing/mask/gas/sechailer/fluff/spartan //LP Spartan: Kaskreyarawkta +/// LP Spartan: Kaskreyarawkta +/obj/item/clothing/mask/gas/sechailer/fluff/spartan name = "minimal gasmask" desc = "Designed to cover as little of face as possible while still being a functional gasmask." icon = 'icons/obj/custom_items.dmi' @@ -1300,7 +1374,8 @@ item_state = "superior_boots" -/obj/item/nullrod/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/nullrod/fluff/chronx fluff_transformations = list(/obj/item/nullrod/fluff/chronx/scythe) /obj/item/nullrod/fluff/chronx/scythe @@ -1310,7 +1385,8 @@ icon_state = "chronx_scythe" item_state = "chronx_scythe" -/obj/item/clothing/head/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/head/fluff/chronx name = "Cthulhu's Hood" desc = "Hood worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' @@ -1340,7 +1416,8 @@ var/datum/action/A = X A.UpdateButtonIcon() -/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/suit/chaplain_hoodie/fluff/chronx name = "Cthulhu's Robes" desc = "Robes worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' @@ -1350,14 +1427,16 @@ adjust_flavour = "untransform" ignore_suitadjust = 0 -/obj/item/clothing/shoes/black/fluff/chronx //chronx100: Hughe O'Splash +/// chronx100: Hughe O'Splash +/obj/item/clothing/shoes/black/fluff/chronx name = "Cthulhu's Boots" desc = "Boots worn by the worshipers of Cthulhu. You see a name inscribed in blood on the inside: Hughe O'Splash" icon = 'icons/obj/custom_items.dmi' icon_state = "chronx_shoes" item_state = "chronx_shoes" -/obj/item/clothing/suit/armor/vest/fluff/tactical //m3hillus: Medusa Schlofield +/// m3hillus: Medusa Schlofield +/obj/item/clothing/suit/armor/vest/fluff/tactical name = "tactical armor vest" desc = "A tactical vest with armored plate inserts." icon = 'icons/obj/clothing/ties.dmi' @@ -1378,7 +1457,8 @@ "Grey" = 'icons/mob/clothing/species/grey/under/donator.dmi' ) -/obj/item/clothing/suit/jacket/fluff/elliot_windbreaker // DaveTheHeadcrab: Elliot Campbell +/// DaveTheHeadcrab: Elliot Campbell +/obj/item/clothing/suit/jacket/fluff/elliot_windbreaker name = "nylon windbreaker" desc = "A cheap nylon windbreaker, according to the tag it was manufactured in New Chiba, Earth.
The color reminds you of a television tuned to a dead channel." icon = 'icons/obj/custom_items.dmi' @@ -1388,7 +1468,8 @@ suit_adjusted = 1 sprite_sheets = null -/obj/item/storage/backpack/fluff/syndiesatchel //SkeletalElite: Rawkkihiki +/// SkeletalElite: Rawkkihiki +/obj/item/storage/backpack/fluff/syndiesatchel name= "Military Satchel" desc = "A well made satchel for military operations. Totally not made by an enemy corporation" icon = 'icons/obj/custom_items.dmi' @@ -1396,28 +1477,32 @@ item_state = null sprite_sheets = null -/obj/item/storage/backpack/fluff/krich_back //lizardzsi: Krichahka +/// lizardzsi: Krichahka +/obj/item/storage/backpack/fluff/krich_back name = "Voxcaster" desc = "Battered, Sol-made military radio backpack that had its speakers fried from playing Vox opera. The words 'Swift-Talon' are crudely scratched onto its side." icon = 'icons/obj/custom_items.dmi' icon_state = "voxcaster_fluff" item_state = null -/obj/item/storage/backpack/fluff/ssscratches_back //Ssscratches: Lasshy-Bot +/// Ssscratches: Lasshy-Bot +/obj/item/storage/backpack/fluff/ssscratches_back name = "CatPack" desc = "It's a backpack, but it's also a cat." icon = 'icons/obj/custom_items.dmi' icon_state = "ssscratches_backpack" item_state = null -/obj/item/storage/backpack/fluff/thebrew //Greey: Korala Ice +/// Greey: Korala Ice +/obj/item/storage/backpack/fluff/thebrew name = "The Brew" desc = "Amber colored backpack resembling a long lost friend, a spirit long forgotten." icon = 'icons/obj/custom_items.dmi' icon_state = "greeyfluff" item_state = "greeyfluff" -/obj/item/clothing/head/wizard/fake/fluff/dreamy //phantasmicdream : Dreamy Rockwall +/// phantasmicdream : Dreamy Rockwall +/obj/item/clothing/head/wizard/fake/fluff/dreamy name = "strange witch hat" desc = "A shapeshifting witch hat. A strange aura comes from it..." icon = 'icons/obj/custom_items.dmi' @@ -1447,7 +1532,8 @@ return 1 ..() -/obj/item/fluff/zekemirror //phantasmicdream : Zeke Varloss +/// phantasmicdream : Zeke Varloss +/obj/item/fluff/zekemirror name = "engraved hand mirror" desc = "A very classy hand mirror, with fancy detailing." icon = 'icons/obj/custom_items.dmi' @@ -1469,7 +1555,8 @@ to_chat(target, "You take time to admire yourself in [src], brushing your tendrils down and revealing their true length.") -/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace //Fethas: Sefra'neem +/// Fethas: Sefra'neem +/obj/item/clothing/accessory/necklace/locket/fluff/fethasnecklace name = "Orange gemmed locket" desc = "A locket with a orange gem set on the front, the picture inside seems to be of a Tajaran." icon = 'icons/obj/custom_items.dmi' @@ -1478,7 +1565,8 @@ item_color = "fethasnecklace" slot_flags = SLOT_FLAG_MASK | SLOT_FLAG_TIE -/obj/item/bedsheet/fluff/hugosheet //HugoLuman: Dan Martinez +/// HugoLuman: Dan Martinez +/obj/item/bedsheet/fluff/hugosheet name = "Cosmic space blankie" desc = "Made from the dreams of space children everywhere." icon = 'icons/obj/custom_items.dmi' @@ -1489,13 +1577,15 @@ item_color = "sheetcosmos" -/obj/item/clothing/head/fluff/lfbowler //Lightfire: Hyperion +/// Lightfire: Hyperion +/obj/item/clothing/head/fluff/lfbowler name = "classy bowler hat" desc = "A very classy looking bowler hat." icon = 'icons/obj/custom_items.dmi' icon_state = "bowler_lightfire" -/obj/item/clothing/under/fluff/lfvicsuit //Lightfire: Hyperion +/// Lightfire: Hyperion +/obj/item/clothing/under/fluff/lfvicsuit name = "classy victorian suit" desc = "A blue and black victorian suit with silver buttons, very fancy!" icon = 'icons/obj/custom_items.dmi' @@ -1507,7 +1597,8 @@ displays_id = FALSE -/obj/item/fluff/lighty_plasman_modkit // LightFire53: Ikelos +/// LightFire53: Ikelos +/obj/item/fluff/lighty_plasman_modkit name = "plasmaman suit modkit" desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments." icon_state = "modkit" @@ -1553,11 +1644,13 @@ else to_chat(user, "You can't modify [target]!") -/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff // LightFire53: Ikelos +/// LightFire53: Ikelos +/obj/item/clothing/head/helmet/space/plasmaman/lf53_fluff icon_state = "ikelos_envirohelm" // New item needed because `initial(icon_state)` is used. icon = 'icons/obj/custom_items.dmi' -/obj/item/bikehorn/fluff/pinkbikehorn //Xerdies: Squiddle Toodle +/// Xerdies: Squiddle Toodle +/obj/item/bikehorn/fluff/pinkbikehorn name = "Honkinator5000" desc = "This horn may look ridiculous but is the new hot item for clowns in the Clown Empire. It has a fine print on its side reading: Property of Prince Honktertong the IV" icon = 'icons/obj/custom_items.dmi' @@ -1567,14 +1660,16 @@ icon_state = "teri_horn" item_state = "teri_horn" -/obj/item/clothing/accessory/medal/fluff/elo //V-Force_Bomber: E.L.O. +/// V-Force_Bomber: E.L.O. +/obj/item/clothing/accessory/medal/fluff/elo name = "distinguished medal of loyalty and excellence" desc = "This medal is cut into the shape of a Victoria Cross, and is awarded to those who have proven themselves to Nanotrasen with a long and successful career." icon = 'icons/obj/custom_items.dmi' icon_state = "elo-medal" item_color = "elo-medal" -/obj/item/clothing/suit/fluff/vetcoat //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat name = "Veteran Coat" desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced." icon = 'icons/obj/custom_items.dmi' @@ -1584,15 +1679,18 @@ item_state = "alchemistcoatblack" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS -/obj/item/clothing/suit/fluff/vetcoat/red //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat/red icon_state = "alchemistcoatred" item_state = "alchemistcoatred" -/obj/item/clothing/suit/fluff/vetcoat/navy //Furasian: Fillmoore Grayson +/// Furasian: Fillmoore Grayson +/obj/item/clothing/suit/fluff/vetcoat/navy icon_state = "alchemistcoatnavy" item_state = "alchemistcoatnavy" -/obj/item/clothing/accessory/medal/fluff/panzermedal //PanzerSkull: GRN-DER +/// PanzerSkull: GRN-DER +/obj/item/clothing/accessory/medal/fluff/panzermedal name = "Cross of Valor" desc = "A medal from the bygone Asteroid Wars. Its Ruby shines with a strange intensity." icon = 'icons/obj/custom_items.dmi' @@ -1601,7 +1699,8 @@ item_color = "panzermedal" slot_flags = SLOT_FLAG_TIE -/obj/item/clothing/accessory/medal/fluff/XannZxiax //Sagrotter: Xann Zxiax +/// Sagrotter: Xann Zxiax +/obj/item/clothing/accessory/medal/fluff/XannZxiax name = "Zxiax Garnet" desc = "Green Garnet on fancy blue cord, when you look at the Garnet, you feel strangely appeased." icon = 'icons/obj/custom_items.dmi' @@ -1610,7 +1709,8 @@ item_color = "Xann_necklace" slot_flags = SLOT_FLAG_TIE -/obj/item/clothing/accessory/rbscarf //Rb303: Isthel Eisenwald +/// Rb303: Isthel Eisenwald +/obj/item/clothing/accessory/rbscarf name = "Old purple scarf" desc = "An old, striped purple scarf. It appears to be hand-knitted and has the name 'Isthel' written on it in bad handwriting." icon = 'icons/obj/custom_items.dmi' @@ -1618,13 +1718,15 @@ item_state = "rbscarf" item_color = "rbscarf" -/obj/item/clothing/head/fluff/pinesalad_horns //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/clothing/head/fluff/pinesalad_horns name = "Bluespace Horns" desc = "A pair of fake horns. Now with added bluespace!" icon = 'icons/obj/custom_items.dmi' icon_state = "ps_horns" -/obj/item/storage/backpack/fluff/hiking //Pineapple Salad: Dan Jello +/// Pineapple Salad: Dan Jello +/obj/item/storage/backpack/fluff/hiking name = "\improper Fancy Dufflebag" desc = "It's pretty lightweight for a dufflebag, but it only seems to have as much space as an ordinary backpack." icon = 'icons/obj/custom_items.dmi' @@ -1633,7 +1735,8 @@ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' -/obj/item/clothing/under/fluff/kiaoutfit //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/under/fluff/kiaoutfit name = "Suspicious Outfit" desc = "A very expensive top with intricate details tailored to fit a vox and paired with a glittery blue skirt, probably illegal." icon = 'icons/obj/custom_items.dmi' @@ -1645,7 +1748,8 @@ displays_id = FALSE species_restricted = list("Vox") -/obj/item/clothing/head/fluff/kiahat //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/head/fluff/kiahat name = "Suspicious Witch Hat" desc = "A black witch hat with a blue sash decorated with tiny glimmering stars and a gold squid-like medallion, probably possessed." icon = 'icons/obj/custom_items.dmi' @@ -1655,7 +1759,8 @@ item_state = "kiahat" item_color = "kiahat" -/obj/item/clothing/mask/gas/fluff/kiamask //FullOfSkittles: Kiachi +/// FullOfSkittles: Kiachi +/obj/item/clothing/mask/gas/fluff/kiamask name = "Suspicious Mask" desc = "A sleek mask that blends in with the owner's existing quills using strange technology. It might even be magic..." icon = 'icons/obj/custom_items.dmi' @@ -1683,13 +1788,15 @@ -/obj/item/clothing/gloves/ring/fluff/benjaminfallout //Benjaminfallout: Pretzel Brassheart +/// Benjaminfallout: Pretzel Brassheart +/obj/item/clothing/gloves/ring/fluff/benjaminfallout name = "Pretzel's Ring" desc = "A small platinum ring with a large light blue diamond. Engraved inside the band are the words: 'To my lovely Pristine Princess. Forever yours, Savinien.'" icon_state = "benjaminfallout_ring" -/obj/item/clothing/under/fluff/kikeridress //Gangelwaefre: Kikeri +/// Gangelwaefre: Kikeri +/obj/item/clothing/under/fluff/kikeridress name = "Kikeri's Dress" desc = "A simple black dress with a white undercoat, tied with a blue ribbon." lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' @@ -1701,7 +1808,8 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO species_restricted = list("Vox") -/obj/item/clothing/mask/gas/fluff/kikerimask //Gangelwaefre: Kikeri +/// Gangelwaefre: Kikeri +/obj/item/clothing/mask/gas/fluff/kikerimask name = "Kikeri's Mask" desc = "A light grey mask with masquerade-esque blue details." icon = 'icons/obj/custom_items.dmi' @@ -1713,7 +1821,8 @@ item_color = "kikerimask" species_restricted = list("Vox") -/obj/item/clothing/mask/gas/fluff/yahiyamask //Asmerath: Yahiya +/// Asmerath: Yahiya +/obj/item/clothing/mask/gas/fluff/yahiyamask name = "Yahiya's Mask" desc = "A dark brown and silver mask resembling that of an eagle. There is a fiery red gem embedded into the forehead." icon = 'icons/obj/custom_items.dmi' diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm index 9df87f8d06e2..a9709c5abf8d 100644 --- a/code/modules/economy/economy_machinery/eftpos.dm +++ b/code/modules/economy/economy_machinery/eftpos.dm @@ -105,25 +105,7 @@ if("link_account") if(!account_database) reconnect_database() - if(account_database) - var/attempt_account_num = tgui_input_number(user, "Enter account number to pay EFTPOS charges into:", "New account number", max_value = 9999999, min_value = 1000000) - if(!attempt_account_num) - return - var/attempt_pin = tgui_input_number(user, "Enter pin code", "Account pin", max_value = 99999, min_value = 10000) - if(!check_user_position(user) || !account_database || !attempt_pin) - return - var/datum/money_account/target_account = GLOB.station_money_database.find_user_account(attempt_account_num, include_departments = TRUE) - if(!target_account) - for(var/department_key in GLOB.station_money_database.department_accounts) - var/datum/money_account/department_account = GLOB.station_money_database.department_accounts[department_key] - if(department_account.account_number == attempt_account_num) - target_account = department_account - if(target_account && GLOB.station_money_database.try_authenticate_login(target_account, attempt_pin, TRUE, FALSE, FALSE)) - linked_account = target_account - else - to_chat(user, "[bicon(src)]Unable to connect to inputed account.") - return - else + if(!account_database) to_chat(user, "[bicon(src)]Unable to connect to accounts database.") return var/datum/money_account/target_account = locateUID(params["account"]) diff --git a/code/modules/events/blob/blob_structures/captured_nuke.dm b/code/modules/events/blob/blob_structures/captured_nuke.dm index 3374850b1b2c..030b37d24086 100644 --- a/code/modules/events/blob/blob_structures/captured_nuke.dm +++ b/code/modules/events/blob/blob_structures/captured_nuke.dm @@ -1,4 +1,5 @@ -/obj/structure/blob/captured_nuke //alternative to blob just straight up destroying nukes +/// alternative to blob just straight up destroying nukes +/obj/structure/blob/captured_nuke name = "blob captured nuke" icon_state = "blob" desc = "A Nuclear Warhead tangled in blob tendrils pulsating with a horrific green glow." diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index f82af011b847..2ac68d478554 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -45,7 +45,8 @@ return ..(active_with_role) return 0*/ -/datum/event //NOTE: Times are measured in master controller ticks! +/// NOTE: Times are measured in master controller ticks! +/datum/event /// The human-readable name of the event var/name /// When in the lifetime to call start(). diff --git a/code/modules/events/meteors_event.dm b/code/modules/events/meteors_event.dm index 24ede06bf922..39a2f79c5a6b 100644 --- a/code/modules/events/meteors_event.dm +++ b/code/modules/events/meteors_event.dm @@ -3,11 +3,11 @@ endWhen = 7 var/next_meteor = 6 var/waves = 1 - var/obj/screen/alert/augury/meteor/screen_alert + var/atom/movable/screen/alert/augury/meteor/screen_alert /datum/event/meteor_wave/setup() for(var/mob/dead/observer/O in GLOB.dead_mob_list) - var/obj/screen/alert/augury/meteor/A = O.throw_alert("\ref[src]_augury", /obj/screen/alert/augury/meteor) + var/atom/movable/screen/alert/augury/meteor/A = O.throw_alert("\ref[src]_augury", /atom/movable/screen/alert/augury/meteor) if(A) screen_alert = A @@ -23,7 +23,7 @@ /datum/event/meteor_wave/tick() // keep observers updated with the alert for(var/mob/dead/observer/O in GLOB.dead_mob_list) - O.throw_alert("\ref[src]_augury", /obj/screen/alert/augury/meteor) + O.throw_alert("\ref[src]_augury", /atom/movable/screen/alert/augury/meteor) if(waves && activeFor >= next_meteor) INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_meteors), get_meteor_count(), get_meteors()) next_meteor += rand(15, 30) / severity diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 00b1914c181b..dad1fac6c8d7 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -218,7 +218,8 @@ if(!isvineimmune(eater)) eater.adjustToxLoss(5) -/datum/spacevine_mutation/explosive //OH SHIT IT CAN CHAINREACT RUN!!! +/// OH SHIT IT CAN CHAINREACT RUN!!! +/datum/spacevine_mutation/explosive name = "explosive" hue = "#ff0000" quality = NEGATIVE @@ -261,7 +262,8 @@ prey.wither() . = TRUE -/datum/spacevine_mutation/aggressive_spread //very OP, but im out of other ideas currently +/// very OP, but im out of other ideas currently +/datum/spacevine_mutation/aggressive_spread name = "aggressive spreading" hue = "#333333" severity = 3 diff --git a/code/modules/events/wizard/ghost_wizard_spells.dm b/code/modules/events/wizard/ghost_wizard_spells.dm index e703799ff025..f824344c8333 100644 --- a/code/modules/events/wizard/ghost_wizard_spells.dm +++ b/code/modules/events/wizard/ghost_wizard_spells.dm @@ -1,10 +1,12 @@ -/datum/event/wizard/ghost //The spook is real +/// The spook is real +/datum/event/wizard/ghost /datum/event/wizard/ghost/start() var/msg = "You suddenly feel extremely obvious..." set_observer_default_invisibility(0, msg) -/datum/event/wizard/ghost_mute //The spook is silent +/// The spook is silent +/datum/event/wizard/ghost_mute /datum/event/wizard/ghost_mute/start() GLOB.dsay_enabled = FALSE diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm index fc9e0a75aa26..bbfbaa8e0f3c 100644 --- a/code/modules/food_and_drinks/drinks/drinks_base.dm +++ b/code/modules/food_and_drinks/drinks/drinks_base.dm @@ -156,7 +156,8 @@ materials = list(MAT_METAL=400) volume = 25 -/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win //2023 toolbox tournament 3rd place went to paradise station. +/// 2023 toolbox tournament 3rd place went to paradise station. +/obj/item/reagent_containers/drinks/trophy/bronze_cup/toolbox_win name = "3rd place toolbox tournament 2567" desc = "Awarded to centcomms elite toolbox warriors raising money for the GBS research institute." icon_state = "reward_cup" diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 01c99264ebf0..8b083436ea1b 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -135,7 +135,8 @@ list_reagents = list("sugar" = 50) possible_states = list() -/obj/item/reagent_containers/condiment/saltshaker //Seperate from above since it's a small shaker rather then +/// Seperate from above since it's a small shaker rather then +/obj/item/reagent_containers/condiment/saltshaker name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 8d22dd0d9db3..01db2bfef503 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -302,7 +302,8 @@ do {\ snack_overlays = 0 top = 0 -/obj/item/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for. +/// In the event you fuckers find something I forgot to add a customizable food for. +/obj/item/food/snacks/customizable/fullycustom name = "on a plate" desc = "A unique dish." icon_state = "fullycustom" diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index a0cf80c61b6a..cefb49fd02ee 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -239,7 +239,8 @@ return ..() -/obj/item/food/snacks/choc_pile //for reagent chocolate being spilled on turfs +/// for reagent chocolate being spilled on turfs +/obj/item/food/snacks/choc_pile name = "pile of chocolate" desc = "A pile of pure chocolate pieces." icon_state = "cocoa" diff --git a/code/modules/food_and_drinks/food/foods/side_dishes.dm b/code/modules/food_and_drinks/food/foods/side_dishes.dm index fbfdf0394622..648fd6f1038d 100644 --- a/code/modules/food_and_drinks/food/foods/side_dishes.dm +++ b/code/modules/food_and_drinks/food/foods/side_dishes.dm @@ -72,7 +72,8 @@ list_reagents = list("nutriment" = 10, "beans" = 10, "vitamin" = 3) tastes = list("beans" = 1) -/obj/item/food/snacks/mashed_potatoes //mashed taters +/// mashed taters +/obj/item/food/snacks/mashed_potatoes name = "mashed potatoes" desc = "Some soft, creamy, and irresistible mashed potatoes." icon_state = "mashedtaters" diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index e95dad37b108..0d639141d32b 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -568,7 +568,8 @@ ) result = /obj/item/food/snacks/toastedsandwich -/datum/recipe/oven/turkey // Magic +/// Magic +/datum/recipe/oven/turkey items = list( /obj/item/food/snacks/meat, /obj/item/food/snacks/meat, diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index eb3029bd4dac..0093de600011 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -239,7 +239,7 @@ if(!ishuman(M)) return - if(istype(over, /obj/screen)) + if(is_screen_atom(over)) if(!remove_item_from_storage(get_turf(M))) M.unEquip(src) switch(over.name) diff --git a/code/modules/hallucinations/effects/moderate.dm b/code/modules/hallucinations/effects/moderate.dm index 187639a5cc55..3e8a8f883e92 100644 --- a/code/modules/hallucinations/effects/moderate.dm +++ b/code/modules/hallucinations/effects/moderate.dm @@ -15,19 +15,19 @@ duration = list(10 SECONDS, 25 SECONDS) /// The possible alerts to be displayed. Key is alert type, value is alert category. var/list/alerts = list( - /obj/screen/alert/not_enough_oxy = "not_enough_oxy", - /obj/screen/alert/not_enough_tox = "not_enough_tox", - /obj/screen/alert/not_enough_co2 = "not_enough_co2", - /obj/screen/alert/not_enough_nitro = "not_enough_nitro", - /obj/screen/alert/too_much_oxy = "too_much_oxy", - /obj/screen/alert/too_much_co2 = "too_much_co2", - /obj/screen/alert/too_much_tox = "too_much_tox", - /obj/screen/alert/hunger/fat = "nutrition", - /obj/screen/alert/hunger/starving = "nutrition", - /obj/screen/alert/hot = "temp", - /obj/screen/alert/cold = "temp", - /obj/screen/alert/highpressure = "pressure", - /obj/screen/alert/lowpressure = "pressure", + /atom/movable/screen/alert/not_enough_oxy = "not_enough_oxy", + /atom/movable/screen/alert/not_enough_tox = "not_enough_tox", + /atom/movable/screen/alert/not_enough_co2 = "not_enough_co2", + /atom/movable/screen/alert/not_enough_nitro = "not_enough_nitro", + /atom/movable/screen/alert/too_much_oxy = "too_much_oxy", + /atom/movable/screen/alert/too_much_co2 = "too_much_co2", + /atom/movable/screen/alert/too_much_tox = "too_much_tox", + /atom/movable/screen/alert/hunger/fat = "nutrition", + /atom/movable/screen/alert/hunger/starving = "nutrition", + /atom/movable/screen/alert/hot = "temp", + /atom/movable/screen/alert/cold = "temp", + /atom/movable/screen/alert/highpressure = "pressure", + /atom/movable/screen/alert/lowpressure = "pressure", ) /// Alert severities. Only needed for some alerts such as temperature or pressure. Key is alert category, value is severity. var/list/severities = list( diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 57d8f8c7e5d2..7126866a9a37 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -133,7 +133,8 @@ icon_state = "bluenana_peel" // Other -/obj/item/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/// used by /obj/item/clothing/shoes/clown_shoes/banana_shoes +/obj/item/grown/bananapeel/specialpeel name = "synthesized banana peel" desc = "A synthetic banana peel." diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 0f624c37e1d1..888bcdc9aefa 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -87,7 +87,8 @@ filling_color = "#FFD700" // Combustible lemon -/obj/item/seeds/firelemon //combustible lemon is too long so firelemon +/// combustible lemon is too long so firelemon +/obj/item/seeds/firelemon name = "pack of combustible lemon seeds" desc = "When life gives you lemons, don't make lemonade. Make life take the lemons back! Get mad! I don't want your damn lemons!" icon_state = "seed-firelemon" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 42d7eaa2e9c5..f71f1edf2119 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -118,7 +118,8 @@ mutatelist = list(/obj/item/seeds/sunflower/moonflower, /obj/item/seeds/sunflower/novaflower) reagents_add = list("cornoil" = 0.08, "plantmatter" = 0.04) -/obj/item/grown/sunflower // FLOWER POWER! +/// FLOWER POWER! +/obj/item/grown/sunflower seed = /obj/item/seeds/sunflower name = "sunflower" desc = "It's beautiful! A certain person might beat you to death if you trample these." diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index 78fe7964c461..1d79c1d0b317 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -28,7 +28,8 @@ reagents_add = list("facid" = 0.25, "sacid" = 0.25) rarity = 20 -/obj/item/grown/nettle //abstract type +/// abstract type +/obj/item/grown/nettle name = "nettle" desc = "It's probably not wise to touch it with bare hands..." icon = 'icons/obj/items.dmi' diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 1c33b6ce5dae..9acbcc055fb4 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -119,7 +119,8 @@ /obj/structure/bonfire/dense density = TRUE -/obj/structure/bonfire/lit //haha empty define +/// haha empty define +/obj/structure/bonfire/lit /obj/structure/bonfire/lit/dense density = TRUE diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 4fcbe25430e1..820cf7420c88 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -2,7 +2,8 @@ // Other harvested materials from plants (that are not food) // ********************** -/obj/item/grown // Grown weapons +/// Grown weapons +/obj/item/grown name = "grown_weapon" icon = 'icons/obj/hydroponics/harvest.dmi' resistance_flags = FLAMMABLE diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 73154db5ef96..f5bbb310453b 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -14,7 +14,8 @@ // Hydroponics Tools // ************************************* -/obj/item/reagent_containers/spray/weedspray // -- Skie +/// -- Skie +/obj/item/reagent_containers/spray/weedspray name = "weed spray" desc = "It's a toxic mixture, in spray form, to kill small weeds." icon = 'icons/obj/hydroponics/equipment.dmi' @@ -34,7 +35,8 @@ user.visible_message("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.") return TOXLOSS -/obj/item/reagent_containers/spray/pestspray // -- Skie +/// -- Skie +/obj/item/reagent_containers/spray/pestspray name = "pest spray" desc = "It's some pest eliminator spray! Do not inhale!" icon = 'icons/obj/hydroponics/equipment.dmi' diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm index ebeaac15cddf..42fe9a3adff7 100644 --- a/code/modules/hydroponics/hydroponics_tray.dm +++ b/code/modules/hydroponics/hydroponics_tray.dm @@ -96,7 +96,7 @@ var/list/connected = list() var/list/processing_atoms = list(src) - while(processing_atoms.len) + while(length(processing_atoms)) var/atom/a = processing_atoms[1] for(var/step_dir in GLOB.cardinal) var/obj/machinery/hydroponics/h = locate() in get_step(a, step_dir) @@ -485,12 +485,12 @@ else to_chat(user, "The pests seem to behave oddly, but quickly settle down...") -/obj/machinery/hydroponics/proc/applyChemicals(datum/reagents/S, mob/user) +/obj/machinery/hydroponics/proc/apply_chemicals(mob/user) if(myseed) - myseed.on_chem_reaction(S) //In case seeds have some special interactions with special chems, currently only used by vines + myseed.on_chem_reaction(reagents) //In case seeds have some special interactions with special chems, currently only used by vines // Requires 5 mutagen to possibly change species.// Poor man's mutagen. - if(S.has_reagent("mutagen", 5) || S.has_reagent("radium", 10) || S.has_reagent("uranium", 10)) + if(reagents.has_reagent("mutagen", 5) || reagents.has_reagent("radium", 10) || reagents.has_reagent("uranium", 10)) switch(rand(100)) if(91 to 100) adjustHealth(-10) @@ -511,212 +511,212 @@ to_chat(user, "Nothing happens...") // 2 or 1 units is enough to change the yield and other stats.// Can change the yield and other stats, but requires more than mutagen - else if(S.has_reagent("mutagen", 2) || S.has_reagent("radium", 5) || S.has_reagent("uranium", 5)) + else if(reagents.has_reagent("mutagen", 2) || reagents.has_reagent("radium", 5) || reagents.has_reagent("uranium", 5)) hardmutate() - else if(S.has_reagent("mutagen", 1) || S.has_reagent("radium", 2) || S.has_reagent("uranium", 2)) + else if(reagents.has_reagent("mutagen", 1) || reagents.has_reagent("radium", 2) || reagents.has_reagent("uranium", 2)) mutate() // After handling the mutating, we now handle the damage from adding crude radioactives... - if(S.has_reagent("uranium", 1)) - adjustHealth(-round(S.get_reagent_amount("uranium") * 1)) - adjustToxic(round(S.get_reagent_amount("uranium") * 2)) - if(S.has_reagent("radium", 1)) - adjustHealth(-round(S.get_reagent_amount("radium") * 1)) - adjustToxic(round(S.get_reagent_amount("radium") * 3)) // Radium is harsher (OOC: also easier to produce) + if(reagents.has_reagent("uranium", 1)) + adjustHealth(-round(reagents.get_reagent_amount("uranium") * 1)) + adjustToxic(round(reagents.get_reagent_amount("uranium") * 2)) + if(reagents.has_reagent("radium", 1)) + adjustHealth(-round(reagents.get_reagent_amount("radium") * 1)) + adjustToxic(round(reagents.get_reagent_amount("radium") * 3)) // Radium is harsher (OOC: also easier to produce) // Nutriments - if(S.has_reagent("eznutriment", 1)) + if(reagents.has_reagent("eznutriment", 1)) yieldmod = 1 mutmod = 1 - adjustNutri(round(S.get_reagent_amount("eznutriment") * 1)) + adjustNutri(round(reagents.get_reagent_amount("eznutriment") * 1)) - if(S.has_reagent("left4zednutriment", 1)) + if(reagents.has_reagent("left4zednutriment", 1)) yieldmod = 0 mutmod = 2 - adjustNutri(round(S.get_reagent_amount("left4zednutriment") * 1)) + adjustNutri(round(reagents.get_reagent_amount("left4zednutriment") * 1)) - if(S.has_reagent("robustharvestnutriment", 1)) + if(reagents.has_reagent("robustharvestnutriment", 1)) yieldmod = 1.3 mutmod = 0 - adjustNutri(round(S.get_reagent_amount("robustharvestnutriment") *1 )) + adjustNutri(round(reagents.get_reagent_amount("robustharvestnutriment") *1 )) //Fish Water is both an excellent fertilizer and waters - if(S.has_reagent("fishwater", 1)) - adjustNutri(round(S.get_reagent_amount("fishwater") * 0.75)) - adjustWater(round(S.get_reagent_amount("fishwater") * 1)) + if(reagents.has_reagent("fishwater", 1)) + adjustNutri(round(reagents.get_reagent_amount("fishwater") * 0.75)) + adjustWater(round(reagents.get_reagent_amount("fishwater") * 1)) // Ambrosia Gaia produces earthsblood. - if(S.has_reagent("earthsblood")) - self_sufficiency_progress += S.get_reagent_amount("earthsblood") + if(reagents.has_reagent("earthsblood")) + self_sufficiency_progress += reagents.get_reagent_amount("earthsblood") if(self_sufficiency_progress >= self_sufficiency_req) become_self_sufficient() else if(!self_sustaining) to_chat(user, "[src] warms as it might on a spring day under a genuine Sun.") // Antitoxin binds shit pretty well. So the tox goes significantly down - if(S.has_reagent("charcoal", 1)) - adjustToxic(-round(S.get_reagent_amount("charcoal") * 2)) + if(reagents.has_reagent("charcoal", 1)) + adjustToxic(-round(reagents.get_reagent_amount("charcoal") * 2)) // BRO, YOU JUST WENT ON FULL STUPID. - if(S.has_reagent("toxin", 1)) - adjustToxic(round(S.get_reagent_amount("toxin") * 2)) + if(reagents.has_reagent("toxin", 1)) + adjustToxic(round(reagents.get_reagent_amount("toxin") * 2)) // Milk is good for humans, but bad for plants. The sugars canot be used by plants, and the milk fat fucks up growth. Not shrooms though. I can't deal with this now... - if(S.has_reagent("milk", 1)) - adjustNutri(round(S.get_reagent_amount("milk") * 0.1)) - adjustWater(round(S.get_reagent_amount("milk") * 0.9)) + if(reagents.has_reagent("milk", 1)) + adjustNutri(round(reagents.get_reagent_amount("milk") * 0.1)) + adjustWater(round(reagents.get_reagent_amount("milk") * 0.9)) // Beer is a chemical composition of alcohol and various other things. It's a shitty nutrient but hey, it's still one. Also alcohol is bad, mmmkay? - if(S.has_reagent("beer", 1)) - adjustHealth(-round(S.get_reagent_amount("beer") * 0.05)) - adjustNutri(round(S.get_reagent_amount("beer") * 0.25)) - adjustWater(round(S.get_reagent_amount("beer") * 0.7)) + if(reagents.has_reagent("beer", 1)) + adjustHealth(-round(reagents.get_reagent_amount("beer") * 0.05)) + adjustNutri(round(reagents.get_reagent_amount("beer") * 0.25)) + adjustWater(round(reagents.get_reagent_amount("beer") * 0.7)) // You're an idiot for thinking that one of the most corrosive and deadly gasses would be beneficial - if(S.has_reagent("fluorine", 1)) - adjustHealth(-round(S.get_reagent_amount("fluorine") * 2)) - adjustToxic(round(S.get_reagent_amount("fluorine") * 2.5)) - adjustWater(-round(S.get_reagent_amount("fluorine") * 0.5)) + if(reagents.has_reagent("fluorine", 1)) + adjustHealth(-round(reagents.get_reagent_amount("fluorine") * 2)) + adjustToxic(round(reagents.get_reagent_amount("fluorine") * 2.5)) + adjustWater(-round(reagents.get_reagent_amount("fluorine") * 0.5)) adjustWeeds(-rand(1,4)) // You're an idiot for thinking that one of the most corrosive and deadly gasses would be beneficial - if(S.has_reagent("chlorine", 1)) - adjustHealth(-round(S.get_reagent_amount("chlorine") * 1)) - adjustToxic(round(S.get_reagent_amount("chlorine") * 1.5)) - adjustWater(-round(S.get_reagent_amount("chlorine") * 0.5)) + if(reagents.has_reagent("chlorine", 1)) + adjustHealth(-round(reagents.get_reagent_amount("chlorine") * 1)) + adjustToxic(round(reagents.get_reagent_amount("chlorine") * 1.5)) + adjustWater(-round(reagents.get_reagent_amount("chlorine") * 0.5)) adjustWeeds(-rand(1,3)) // White Phosphorous + water -> phosphoric acid. That's not a good thing really. // Phosphoric salts are beneficial though. And even if the plant suffers, in the long run the tray gets some nutrients. The benefit isn't worth that much. - if(S.has_reagent("phosphorus", 1)) - adjustHealth(-round(S.get_reagent_amount("phosphorus") * 0.75)) - adjustNutri(round(S.get_reagent_amount("phosphorus") * 0.1)) - adjustWater(-round(S.get_reagent_amount("phosphorus") * 0.5)) + if(reagents.has_reagent("phosphorus", 1)) + adjustHealth(-round(reagents.get_reagent_amount("phosphorus") * 0.75)) + adjustNutri(round(reagents.get_reagent_amount("phosphorus") * 0.1)) + adjustWater(-round(reagents.get_reagent_amount("phosphorus") * 0.5)) adjustWeeds(-rand(1,2)) // Plants should not have sugar, they can't use it and it prevents them getting water/ nutients, it is good for mold though... - if(S.has_reagent("sugar", 1)) + if(reagents.has_reagent("sugar", 1)) adjustWeeds(rand(1,2)) adjustPests(rand(1,2)) - adjustNutri(round(S.get_reagent_amount("sugar") * 0.1)) + adjustNutri(round(reagents.get_reagent_amount("sugar") * 0.1)) // It is water! - if(S.has_reagent("water", 1)) - adjustWater(round(S.get_reagent_amount("water") * 1)) + if(reagents.has_reagent("water", 1)) + adjustWater(round(reagents.get_reagent_amount("water") * 1)) // Holy water. Mostly the same as water, it also heals the plant a little with the power of the spirits~ - if(S.has_reagent("holywater", 1)) - adjustWater(round(S.get_reagent_amount("holywater") * 1)) - adjustHealth(round(S.get_reagent_amount("holywater") * 0.1)) + if(reagents.has_reagent("holywater", 1)) + adjustWater(round(reagents.get_reagent_amount("holywater") * 1)) + adjustHealth(round(reagents.get_reagent_amount("holywater") * 0.1)) // A variety of nutrients are dissolved in club soda, without sugar. // These nutrients include carbon, oxygen, hydrogen, phosphorous, potassium, sulfur and sodium, all of which are needed for healthy plant growth. - if(S.has_reagent("sodawater", 1)) - adjustWater(round(S.get_reagent_amount("sodawater") * 1)) - adjustHealth(round(S.get_reagent_amount("sodawater") * 0.1)) - adjustNutri(round(S.get_reagent_amount("sodawater") * 0.1)) + if(reagents.has_reagent("sodawater", 1)) + adjustWater(round(reagents.get_reagent_amount("sodawater") * 1)) + adjustHealth(round(reagents.get_reagent_amount("sodawater") * 0.1)) + adjustNutri(round(reagents.get_reagent_amount("sodawater") * 0.1)) // Man, you guys are daft - if(S.has_reagent("sacid", 1)) - adjustHealth(-round(S.get_reagent_amount("sacid") * 1)) - adjustToxic(round(S.get_reagent_amount("sacid") * 1.5)) + if(reagents.has_reagent("sacid", 1)) + adjustHealth(-round(reagents.get_reagent_amount("sacid") * 1)) + adjustToxic(round(reagents.get_reagent_amount("sacid") * 1.5)) adjustWeeds(-rand(1,2)) // SERIOUSLY - if(S.has_reagent("facid", 1)) - adjustHealth(-round(S.get_reagent_amount("facid") * 2)) - adjustToxic(round(S.get_reagent_amount("facid") * 3)) + if(reagents.has_reagent("facid", 1)) + adjustHealth(-round(reagents.get_reagent_amount("facid") * 2)) + adjustToxic(round(reagents.get_reagent_amount("facid") * 3)) adjustWeeds(-rand(1,4)) // Glyphosate is just as bad - if(S.has_reagent("glyphosate", 1)) - adjustHealth(-round(S.get_reagent_amount("glyphosate") * 5)) - adjustToxic(round(S.get_reagent_amount("glyphosate") * 6)) + if(reagents.has_reagent("glyphosate", 1)) + adjustHealth(-round(reagents.get_reagent_amount("glyphosate") * 5)) + adjustToxic(round(reagents.get_reagent_amount("glyphosate") * 6)) adjustWeeds(-rand(4,8)) // why, just why - if(S.has_reagent("napalm", 1)) + if(reagents.has_reagent("napalm", 1)) if(!(myseed.resistance_flags & FIRE_PROOF)) - adjustHealth(-round(S.get_reagent_amount("napalm") * 6)) - adjustToxic(round(S.get_reagent_amount("napalm") * 7)) + adjustHealth(-round(reagents.get_reagent_amount("napalm") * 6)) + adjustToxic(round(reagents.get_reagent_amount("napalm") * 7)) adjustWeeds(-rand(5, 9)) //At least give them a small reward if they bother //Weed Spray - if(S.has_reagent("atrazine", 1)) - adjustToxic(round(S.get_reagent_amount("atrazine") * 0.5)) + if(reagents.has_reagent("atrazine", 1)) + adjustToxic(round(reagents.get_reagent_amount("atrazine") * 0.5)) //old toxicity was 4, each spray is default 10 (minimal of 5) so 5 and 2.5 are the new ammounts adjustWeeds(-rand(1,2)) //Pest Spray - if(S.has_reagent("pestkiller", 1)) - adjustToxic(round(S.get_reagent_amount("pestkiller") * 0.5)) + if(reagents.has_reagent("pestkiller", 1)) + adjustToxic(round(reagents.get_reagent_amount("pestkiller") * 0.5)) adjustPests(-rand(1,2)) // Healing - if(S.has_reagent("cryoxadone", 1)) - adjustHealth(round(S.get_reagent_amount("cryoxadone") * 3)) - adjustToxic(-round(S.get_reagent_amount("cryoxadone") * 3)) + if(reagents.has_reagent("cryoxadone", 1)) + adjustHealth(round(reagents.get_reagent_amount("cryoxadone") * 3)) + adjustToxic(-round(reagents.get_reagent_amount("cryoxadone") * 3)) // Ammonia is bad ass. - if(S.has_reagent("ammonia", 1)) - adjustHealth(round(S.get_reagent_amount("ammonia") * 0.5)) - adjustNutri(round(S.get_reagent_amount("ammonia") * 1)) + if(reagents.has_reagent("ammonia", 1)) + adjustHealth(round(reagents.get_reagent_amount("ammonia") * 0.5)) + adjustNutri(round(reagents.get_reagent_amount("ammonia") * 1)) if(myseed) - myseed.adjust_yield(round(S.get_reagent_amount("ammonia") * 0.01)) + myseed.adjust_yield(round(reagents.get_reagent_amount("ammonia") * 0.01)) // Saltpetre is used for gardening IRL, to simplify highly, it speeds up growth and strengthens plants - if(S.has_reagent("saltpetre", 1)) - var/salt = S.get_reagent_amount("saltpetre") + if(reagents.has_reagent("saltpetre", 1)) + var/salt = reagents.get_reagent_amount("saltpetre") adjustHealth(round(salt * 0.25)) if(myseed) myseed.adjust_production(-round(salt/100)-prob(salt%100)) myseed.adjust_potency(round(salt*0.50)) // Ash is also used IRL in gardening, as a fertilizer enhancer and weed killer - if(S.has_reagent("ash", 1)) - adjustHealth(round(S.get_reagent_amount("ash") * 0.25)) - adjustNutri(round(S.get_reagent_amount("ash") * 0.5)) + if(reagents.has_reagent("ash", 1)) + adjustHealth(round(reagents.get_reagent_amount("ash") * 0.25)) + adjustNutri(round(reagents.get_reagent_amount("ash") * 0.5)) adjustWeeds(-1) // This is more bad ass, and pests get hurt by the corrosive nature of it, not the plant. - if(S.has_reagent("diethylamine", 1)) - adjustHealth(round(S.get_reagent_amount("diethylamine") * 1)) - adjustNutri(round(S.get_reagent_amount("diethylamine") * 2)) + if(reagents.has_reagent("diethylamine", 1)) + adjustHealth(round(reagents.get_reagent_amount("diethylamine") * 1)) + adjustNutri(round(reagents.get_reagent_amount("diethylamine") * 2)) if(myseed) - myseed.adjust_yield(round(S.get_reagent_amount("diethylamine") * 0.02)) + myseed.adjust_yield(round(reagents.get_reagent_amount("diethylamine") * 0.02)) adjustPests(-rand(1,2)) // Compost, effectively - if(S.has_reagent("nutriment", 1)) - adjustHealth(round(S.get_reagent_amount("nutriment") * 0.5)) - adjustNutri(round(S.get_reagent_amount("nutriment") * 1)) + if(reagents.has_reagent("nutriment", 1)) + adjustHealth(round(reagents.get_reagent_amount("nutriment") * 0.5)) + adjustNutri(round(reagents.get_reagent_amount("nutriment") * 1)) - if(S.has_reagent("plantmatter", 1)) - adjustHealth(round(S.get_reagent_amount("plantmatter") * 0.5)) - adjustNutri(round(S.get_reagent_amount("plantmatter") * 1)) + if(reagents.has_reagent("plantmatter", 1)) + adjustHealth(round(reagents.get_reagent_amount("plantmatter") * 0.5)) + adjustNutri(round(reagents.get_reagent_amount("plantmatter") * 1)) // Compost for EVERYTHING - if(S.has_reagent("virusfood", 1)) - adjustNutri(round(S.get_reagent_amount("virusfood") * 0.5)) - adjustHealth(-round(S.get_reagent_amount("virusfood") * 0.5)) + if(reagents.has_reagent("virusfood", 1)) + adjustNutri(round(reagents.get_reagent_amount("virusfood") * 0.5)) + adjustHealth(-round(reagents.get_reagent_amount("virusfood") * 0.5)) // FEED ME - if(S.has_reagent("blood", 1)) - adjustNutri(round(S.get_reagent_amount("blood") * 1)) + if(reagents.has_reagent("blood", 1)) + adjustNutri(round(reagents.get_reagent_amount("blood") * 1)) adjustPests(rand(2,4)) // FEED ME SEYMOUR - if(S.has_reagent("lazarus_reagent", 1)) + if(reagents.has_reagent("lazarus_reagent", 1)) spawnplant() // The best stuff there is. For testing/debugging. - if(S.has_reagent("adminordrazine", 1)) - adjustWater(round(S.get_reagent_amount("adminordrazine") * 1)) - adjustHealth(round(S.get_reagent_amount("adminordrazine") * 1)) - adjustNutri(round(S.get_reagent_amount("adminordrazine") * 1)) + if(reagents.has_reagent("adminordrazine", 1)) + adjustWater(round(reagents.get_reagent_amount("adminordrazine") * 1)) + adjustHealth(round(reagents.get_reagent_amount("adminordrazine") * 1)) + adjustNutri(round(reagents.get_reagent_amount("adminordrazine") * 1)) adjustPests(-rand(1,5)) adjustWeeds(-rand(1,5)) - if(S.has_reagent("adminordrazine", 5)) + if(reagents.has_reagent("adminordrazine", 5)) switch(rand(100)) if(66 to 100) mutatespecie() @@ -726,6 +726,7 @@ mutatepest(user) else to_chat(user, "Nothing happens...") + reagents.clear_reagents() /obj/machinery/hydroponics/attackby(obj/item/O, mob/user, params) //Called when mob user "attacks" it with object O @@ -975,7 +976,8 @@ return ..() /////////////////////////////////////////////////////////////////////////////// -/obj/machinery/hydroponics/soil //Not actually hydroponics at all! Honk! +/// Not actually hydroponics at all! Honk! +/obj/machinery/hydroponics/soil name = "soil" icon = 'icons/obj/hydroponics/equipment.dmi' icon_state = "soil" @@ -999,7 +1001,7 @@ /obj/machinery/hydroponics/proc/add_compost(obj/item/reagent_source, mob/user, transfer_amount, visi_msg, irrigate = FALSE) var/list/trays = list(src)//makes the list just this in cases of syringes and compost etc - if(irrigate && transfer_amount > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation) + if(irrigate && (transfer_amount > 30) && (reagent_source.reagents.total_volume >= 30) && using_irrigation) trays = FindConnected() if(length(trays) > 1) @@ -1009,14 +1011,13 @@ visible_message("[visi_msg].") var/split = round(transfer_amount / length(trays)) - for(var/obj/machinery/hydroponics/H in trays)//cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener - reagent_source.reagents.trans_to(H.reagents, split) - if(isfood(reagent_source) || ispill(reagent_source) || istype(reagent_source, /obj/item/grown)) - qdel(reagent_source) - - H.applyChemicals(reagents, user) - reagents.clear_reagents() + for(var/obj/machinery/hydroponics/H as anything in trays)//cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener + reagent_source.reagents.trans_to(H, split) + H.apply_chemicals(user) H.update_state() + if(isfood(reagent_source) || ispill(reagent_source) || istype(reagent_source, /obj/item/grown)) + qdel(reagent_source) + if(reagent_source) // If the source wasn't composted and destroyed reagent_source.update_icon() diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index ccf886c8b66e..95b53c40d64c 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -450,7 +450,8 @@ S.set_up(G.reagents, splat_location) S.start(smoke_amount) -/datum/plant_gene/trait/fire_resistance // Lavaland +/// Lavaland +/datum/plant_gene/trait/fire_resistance name = "Fire Resistance" /datum/plant_gene/trait/fire_resistance/apply_vars(obj/item/seeds/S) @@ -461,7 +462,8 @@ if(!(G.resistance_flags & FIRE_PROOF)) G.resistance_flags |= FIRE_PROOF -/datum/plant_gene/trait/plant_type // Parent type +/// Parent type +/datum/plant_gene/trait/plant_type name = "you shouldn't see this" trait_id = "plant_type" diff --git a/code/modules/library/library_datums.dm b/code/modules/library/library_datums.dm index 8d191870b266..ccc1b3419249 100644 --- a/code/modules/library/library_datums.dm +++ b/code/modules/library/library_datums.dm @@ -34,7 +34,8 @@ * Used for tracking books that have been checked out from the library by players. Created and stored upon a book being * checked out and deleted upon the book being succesfully checked back in or the librarian marking a book as "lost" */ -/datum/borrowbook // Datum used to keep track of who has borrowed what when and for how long. +/// Datum used to keep track of who has borrowed what when and for how long. +/datum/borrowbook var/bookname var/libraryid var/patron_name @@ -48,7 +49,8 @@ * are designed to only temporarily hold book data * checked out and deleted upon the book being succesfully checked back in or the librarian marking a book as "lost" */ -/datum/cachedbook // Datum used to cache the SQL DB books locally in order to achieve a performance gain. +/// Datum used to cache the SQL DB books locally in order to achieve a performance gain. +/datum/cachedbook var/id var/libraryid var/title diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 0cf585940ed2..a52cc4d9f462 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -1,4 +1,5 @@ -/obj/effect/baseturf_helper //Set the baseturfs of every turf in the /area/ it is placed. +/// Set the baseturfs of every turf in the /area/ it is placed. +/obj/effect/baseturf_helper name = "baseturf editor" icon = 'icons/effects/mapping_helpers.dmi' icon_state = "" @@ -65,6 +66,7 @@ /obj/effect/mapping_helpers/no_lava icon_state = "no_lava" + layer = ON_EDGED_TURF_LAYER /obj/effect/mapping_helpers/no_lava/New() var/turf/T = get_turf(src) diff --git a/code/modules/maptext_alerts/location_blurbs.dm b/code/modules/maptext_alerts/location_blurbs.dm index b50b6b101308..050ca0a42eab 100644 --- a/code/modules/maptext_alerts/location_blurbs.dm +++ b/code/modules/maptext_alerts/location_blurbs.dm @@ -1,4 +1,4 @@ -/obj/screen/text/blurb +/atom/movable/screen/text/blurb maptext_height = 64 maptext_width = 512 screen_loc = "LEFT+1,BOTTOM+2" @@ -33,7 +33,7 @@ var/background_a = 0 -/obj/screen/text/blurb/proc/show_to(list/client/viewers) +/atom/movable/screen/text/blurb/proc/show_to(list/client/viewers) if(!blurb_text || !viewers) return @@ -52,12 +52,12 @@ print_text() if(hold_for) - addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, hide_from), viewers), hold_for) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable/screen/text/blurb, hide_from), viewers), hold_for) else hide_from(viewers) -/obj/screen/text/blurb/proc/get_text_style() +/atom/movable/screen/text/blurb/proc/get_text_style() PRIVATE_PROC(TRUE) return {"\ @@ -69,25 +69,25 @@ color: [text_color]; "} -/obj/screen/text/blurb/proc/hide_from(list/client/viewers) +/atom/movable/screen/text/blurb/proc/hide_from(list/client/viewers) PRIVATE_PROC(TRUE) fade() - addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/screen/text/blurb, remove_from_viewers), viewers), fade_animation_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable/screen/text/blurb, remove_from_viewers), viewers), fade_animation_duration) -/obj/screen/text/blurb/proc/appear() +/atom/movable/screen/text/blurb/proc/appear() PRIVATE_PROC(TRUE) animate(src, alpha = 255, time = appear_animation_duration) -/obj/screen/text/blurb/proc/fade() +/atom/movable/screen/text/blurb/proc/fade() PRIVATE_PROC(TRUE) animate(src, alpha = 0, time = fade_animation_duration) -/obj/screen/text/blurb/proc/print_text() +/atom/movable/screen/text/blurb/proc/print_text() PRIVATE_PROC(TRUE) var/text_style = get_text_style() @@ -97,10 +97,10 @@ maptext += get_formatted_text_segment(text_style, segment_start, segment_end) sleep(interval) -/obj/screen/text/blurb/proc/get_formatted_text_segment(style, segment_start, segment_end) +/atom/movable/screen/text/blurb/proc/get_formatted_text_segment(style, segment_start, segment_end) return "[copytext_char(blurb_text, segment_start, segment_end)]" -/obj/screen/text/blurb/proc/remove_from_viewers(list/client/viewers) +/atom/movable/screen/text/blurb/proc/remove_from_viewers(list/client/viewers) PRIVATE_PROC(TRUE) for(var/client/viewer as anything in viewers) @@ -116,7 +116,7 @@ return SEND_SOUND(show_blurb_to, sound('sound/machines/typewriter.ogg')) - var/obj/screen/text/blurb/location_blurb = new() + var/atom/movable/screen/text/blurb/location_blurb = new() if(antag_check.antag_datums) for(var/datum/antagonist/role) if(role.custom_blurb()) @@ -146,7 +146,7 @@ if(!length(GLOB.clients)) return - var/obj/screen/text/blurb/server_restart_blurb = new() + var/atom/movable/screen/text/blurb/server_restart_blurb = new() server_restart_blurb.text_color = COLOR_RED server_restart_blurb.blurb_text = "Round is restarting...\n[reason]" server_restart_blurb.hold_for = 90 SECONDS diff --git a/code/modules/maptext_alerts/text_blurbs.dm b/code/modules/maptext_alerts/text_blurbs.dm index 5177e2e129ab..285d39693c76 100644 --- a/code/modules/maptext_alerts/text_blurbs.dm +++ b/code/modules/maptext_alerts/text_blurbs.dm @@ -45,7 +45,7 @@ html_tags += list(html_tag, html_tag + 1, html_tag + 2, html_tag + 3) html_tag = findtext(message, regex(""), html_tag + 3) - var/obj/screen/text/T = new() + var/atom/movable/screen/text/T = new() T.screen_loc = screen_position switch(text_alignment) if("center") diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm index 7b018bbca566..0552c9eb101d 100644 --- a/code/modules/martial_arts/krav_maga.dm +++ b/code/modules/martial_arts/krav_maga.dm @@ -171,7 +171,8 @@ . = ..() RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy)) -/obj/item/clothing/gloves/color/black/krav_maga/combat // for nukies +/// for nukies +/obj/item/clothing/gloves/color/black/krav_maga/combat name = "Combat gloves plus" desc = "These combat gloves have been upgraded with nanochips that teach the wearer Krav Maga." icon_state = "combat" diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 17d04d3232ff..e5fa16692b22 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -463,25 +463,25 @@ /obj/item/bostaff/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(HAS_TRAIT(src, TRAIT_WIELDED)) return ..() - return 0 + return FALSE -/obj/screen/combo +/atom/movable/screen/combo icon_state = "" mouse_opacity = MOUSE_OPACITY_TRANSPARENT screen_loc = ui_combo layer = ABOVE_HUD_LAYER var/streak -/obj/screen/combo/proc/clear_streak() +/atom/movable/screen/combo/proc/clear_streak() cut_overlays() streak = "" icon_state = "" -/obj/screen/combo/update_icon(updates, _streak) +/atom/movable/screen/combo/update_icon(updates, _streak) streak = _streak return ..() -/obj/screen/combo/update_overlays() +/atom/movable/screen/combo/update_overlays() . = list() for(var/i in 1 to length(streak)) var/intent_text = copytext(streak, i, i + 1) @@ -489,7 +489,7 @@ intent_icon.pixel_x = 16 * (i - 1) - 8 * length(streak) . += intent_icon -/obj/screen/combo/update_icon_state() +/atom/movable/screen/combo/update_icon_state() icon_state = "" if(!streak) return diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm index 57f32f4dae8b..1d353d1309c8 100644 --- a/code/modules/mining/equipment/marker_beacons.dm +++ b/code/modules/mining/equipment/marker_beacons.dm @@ -27,10 +27,12 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list( max_amount = 100 var/picked_color = "random" -/obj/item/stack/marker_beacon/ten //miners start with 10 of these +/// miners start with 10 of these +/obj/item/stack/marker_beacon/ten amount = 10 -/obj/item/stack/marker_beacon/thirty //and they're bought in stacks of 1, 10, or 30 +/// and they're bought in stacks of 1, 10, or 30 +/obj/item/stack/marker_beacon/thirty amount = 30 /obj/item/stack/marker_beacon/Initialize(mapload) diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 6ee74a27e432..44bc6c90725c 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -105,7 +105,8 @@ origin_tech = "materials=6;powerstorage=4;engineering=4" toolspeed = 0.2 -/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version! +/// This is the BORG version! +/obj/item/pickaxe/drill/cyborg/diamond name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics. icon_state = "diamonddrill" toolspeed = 0.2 diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 903be3aa68bf..3440c1be56e3 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -168,7 +168,8 @@ /obj/effect/portal/advanced/getaway one_use = TRUE -/obj/effect/temp_visual/getaway_flare // Because the original contractor flare is not a temp visual, for some reason. +/// Because the original contractor flare is not a temp visual, for some reason. +/obj/effect/temp_visual/getaway_flare name = "contractor extraction flare" icon = 'icons/obj/lighting.dmi' icon_state = "flare-contractor-on" diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 668442ccf5fa..c8f0a1e584ed 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -75,7 +75,8 @@ else ..() -/obj/structure/flora/ash/tall_shroom //exists only so that the spawning check doesn't allow these spawning near other things +/// exists only so that the spawning check doesn't allow these spawning near other things +/obj/structure/flora/ash/tall_shroom regrowth_time_low = 4200 /obj/structure/flora/ash/leaf_shroom @@ -197,7 +198,8 @@ pixel_x = rand(-4, 4) pixel_y = rand(-4, 4) -/obj/item/food/snacks/grown/ash_flora/shavings //for actual crafting +/// for actual crafting +/obj/item/food/snacks/grown/ash_flora/shavings /obj/item/food/snacks/grown/ash_flora/mushroom_leaf name = "mushroom leaf" diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index 56cc0fbd32ab..5f3cc8f298dd 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -39,19 +39,25 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") flags_2 = RANDOM_BLOCKER_2 var/summon_cooldown = 0 - var/list/mob/dead/observer/spirits + /// List of wisps we have active, for cleanup purposes in case a ghost gets randomly deleted. + var/list/obj/effect/wisp/ghost/orbs + /// List of ghosts currently orbiting us. + var/list/mob/dead/observer/ghosts /obj/item/melee/ghost_sword/New() ..() - spirits = list() + ghosts = list() + orbs = list() register_signals(src) RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) GLOB.poi_list |= src /obj/item/melee/ghost_sword/Destroy() - for(var/mob/dead/observer/G in spirits) + for(var/mob/dead/observer/G in ghosts) remove_ghost(G) - spirits.Cut() + // if there are any orbs left (possibly detached from ghosts) ensure they don't stick around + for(var/spirit as anything in orbs) + qdel(spirit) remove_signals(src) UnregisterSignal(src, COMSIG_MOVABLE_MOVED) GLOB.poi_list -= src @@ -59,8 +65,8 @@ /obj/item/melee/ghost_sword/examine() . = ..() - if(length(spirits)) - . += "It appears to pulse with the power of [length(spirits)] vengeful spirits!" + if(length(orbs)) + . += "It appears to pulse with the power of [length(orbs)] vengeful spirit\s!" else . += "It glows weakly." @@ -83,7 +89,7 @@ /obj/item/melee/ghost_sword/proc/add_ghost(atom/movable/orbited, atom/orbiter) SIGNAL_HANDLER // COMSIG_ATOM_ORBIT_BEGIN var/mob/dead/observer/ghost = orbiter - if(!istype(ghost) || !isobserver(orbiter) || (ghost in spirits)) + if(!istype(ghost) || !isobserver(orbiter) || (ghost in ghosts)) return if(!ismob(loc)) @@ -91,23 +97,34 @@ // they'll get added to spirits (and turned visible) when the sword enters a mob's hand then return - register_signals(ghost) // Pull in any ghosts that may be orbiting other ghosts TODO THIS MIGHT BE THE FUCKIN PROBLEM + register_signals(ghost) // Pull in any ghosts that may be orbiting other ghosts - spirits |= ghost - ghost.invisibility = 0 + + var/obj/effect/wisp/ghost/orb = new(src) + orb.color = ghost.get_runechat_color() + orb.alpha = 128 + orb.orbit(src, clockwise = FALSE) + ghosts[ghost] = orb + orbs.Add(orb) + + // if a ghost gets deleted, the orb cleans itself up + // which then passes the torch to us to clean ourselves up + RegisterSignal(orb, COMSIG_PARENT_QDELETING, PROC_REF(on_orb_qdel)) /obj/item/melee/ghost_sword/proc/remove_ghost(atom/movable/orbited, atom/orbiter) SIGNAL_HANDLER // COMSIG_ATOM_ORBIT_STOP var/mob/dead/observer/ghost = orbiter - if(!istype(ghost) || !isobserver(ghost) || !(ghost in spirits)) + if(!istype(ghost) || !(ghost in ghosts)) return remove_signals(ghost) - spirits -= ghost - ghost.invisibility = initial(ghost.invisibility) + var/obj/effect/wisp/ghost/attached_orb = ghosts[ghost] + attached_orb.stop_orbit() + qdel(attached_orb) + ghosts -= ghost /obj/item/melee/ghost_sword/proc/remove_signals(atom/A) UnregisterSignal(A, COMSIG_ATOM_ORBIT_STOP) @@ -126,7 +143,7 @@ if(ismob(old_loc)) remove_signals(old_loc) - for(var/mob/dead/observer/orbiter in spirits) + for(var/mob/dead/observer/orbiter in ghosts) remove_ghost(src, orbiter) if(ismob(loc)) @@ -135,20 +152,48 @@ for(var/mob/dead/observer/orbiter in get_orbiters_up_hierarchy(recursive = TRUE)) add_ghost(src, orbiter) +// clean up wisps +/obj/item/melee/ghost_sword/proc/on_orb_qdel(obj/effect/wisp/ghost/orb) + SIGNAL_HANDLER // COMSIG_PARENT_QDELETING + orbs -= orb + for(var/ghost in ghosts) + if(ghosts[ghost] == orb) + ghosts -= ghost + break + + /obj/item/melee/ghost_sword/attack(mob/living/target, mob/living/carbon/human/user) force = 0 - var/ghost_counter = length(spirits) + var/ghost_counter = length(orbs) force = clamp((ghost_counter * 4), 0, 75) - user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!") + user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirit\s!") ..() /obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) - var/ghost_counter = length(spirits) + var/ghost_counter = length(orbs) final_block_chance += clamp((ghost_counter * 5), 0, 75) - owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!") + owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghost\s!") return ..() + +/obj/effect/wisp/ghost + name = "mischievous wisp" + desc = "A wisp that seems to want to get up to shenanigans. It often seems disappointed, for some reason." + light_range = 0 + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/obj/effect/wisp/ghost/Initialize(mapload, mob/dead/observer/ghost) + . = ..() + RegisterSignal(ghost, COMSIG_PARENT_QDELETING, PROC_REF(on_ghost_qdel)) + +/obj/effect/wisp/ghost/proc/on_ghost_qdel(mob/dead/observer/ghost) + SIGNAL_HANDLER // COMSIG_PARENT_QDELETING + stop_orbit() + // we only live as long as our attached ghost + qdel(src) + + // Blood /obj/item/dragons_blood diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index 38d4653f196c..c0aa03e2d822 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -85,7 +85,8 @@ new random_crystal(loc) return INITIALIZE_HINT_QDEL -/obj/machinery/anomalous_crystal/theme_warp //Warps the area you're in to look like a new one +/// Warps the area you're in to look like a new one +/obj/machinery/anomalous_crystal/theme_warp activation_method = "touch" cooldown_add = 200 var/terrain_theme = "winter" @@ -159,7 +160,8 @@ continue affected_targets += A -/obj/machinery/anomalous_crystal/emitter //Generates a projectile when interacted with +/// Generates a projectile when interacted with +/obj/machinery/anomalous_crystal/emitter activation_method = "touch" cooldown_add = 50 var/generated_projectile = /obj/item/projectile/beam/emitter @@ -188,7 +190,8 @@ P.xo = 0 P.fire() -/obj/machinery/anomalous_crystal/dark_reprise //Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down. +/// Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down. +/obj/machinery/anomalous_crystal/dark_reprise activation_method = "touch" activation_sound = 'sound/hallucinations/growl1.ogg' @@ -206,7 +209,8 @@ ADD_TRAIT(H, TRAIT_BADDNA, MAGIC_TRAIT) //Free revives, but significantly limits your options for reviving except via the crystal H.grab_ghost(force = TRUE) -/obj/machinery/anomalous_crystal/helpers //Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans +/// Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans +/obj/machinery/anomalous_crystal/helpers activation_method = "touch" var/ready_to_deploy = 0 @@ -299,7 +303,8 @@ /mob/living/simple_animal/hostile/lightgeist/ghost() qdel(src) -/obj/machinery/anomalous_crystal/possessor //Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU. +/// Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU. +/obj/machinery/anomalous_crystal/possessor activation_method = "touch" /obj/machinery/anomalous_crystal/possessor/ActivationReaction(mob/user, method) diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 5c643f07398c..fb565ec9893e 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -66,9 +66,9 @@ return if(!M.restrained() && !M.stat) - playsound(loc, "rustle", 50, 1, -5) + playsound(loc, "rustle", 50, TRUE, -5) - if(istype(over_object, /obj/screen/inventory/hand)) + if(istype(over_object, /atom/movable/screen/inventory/hand)) if(!M.unEquip(src)) return M.put_in_active_hand(src) diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm index e832baa543ee..07efb712c6f8 100644 --- a/code/modules/mob/dead/observer/observer_base.dm +++ b/code/modules/mob/dead/observer/observer_base.dm @@ -35,6 +35,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) ///toggle for ghost gas analyzer var/gas_analyzer = FALSE var/datum/orbit_menu/orbit_menu + /// The "color" their runechat would have had + var/alive_runechat_color = "#FFFFFF" /mob/dead/observer/New(mob/body=null, flags=1) set_invisibility(GLOB.observer_default_invisibility) @@ -59,6 +61,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) if(ismob(body)) T = get_turf(body) //Where is the body located? attack_log_old = body.attack_log_old //preserve our attack logs by copying them to our ghost + alive_runechat_color = body.get_runechat_color() var/mutable_appearance/MA = copy_appearance(body) if(body.mind && body.mind.name) @@ -311,7 +314,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(message) to_chat(src, "[message]") if(source) - var/obj/screen/alert/A = throw_alert("\ref[source]_notify_cloning", /obj/screen/alert/notify_cloning) + var/atom/movable/screen/alert/A = throw_alert("\ref[source]_notify_cloning", /atom/movable/screen/alert/notify_cloning) if(A) if(client && client.prefs && client.prefs.UI_style) A.icon = ui_style2icon(client.prefs.UI_style) @@ -846,3 +849,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return allow_roundstart_observers return FALSE + +/mob/dead/observer/get_runechat_color() + return alive_runechat_color diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index e48f38e341e1..817b30b0cd96 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -200,7 +200,7 @@ mmi = null return ..() -/datum/action/generic/configure_mmi_radio/ApplyIcon(obj/screen/movable/action_button/current_button) +/datum/action/generic/configure_mmi_radio/ApplyIcon(atom/movable/screen/movable/action_button/current_button) icon_icon = mmi.icon button_icon_state = mmi.icon_state ..() diff --git a/code/modules/mob/living/brain/brain_emote.dm b/code/modules/mob/living/brain/brain_emote.dm index 13fcf0c4104e..861e1706a59b 100644 --- a/code/modules/mob/living/brain/brain_emote.dm +++ b/code/modules/mob/living/brain/brain_emote.dm @@ -25,6 +25,10 @@ if(!(B.container && istype(B.container, /obj/item/mmi))) // No MMI, no emotes return FALSE + if(istype(B.container, /obj/item/mmi/robotic_brain)) //Robobrains can't be silenced and still emote + var/obj/item/mmi/robotic_brain/robobrain = B.container + return !robobrain.silenced + // So, brains can't really see their own emotes so we'll probably just want to send an extra message /datum/emote/living/brain/alarm diff --git a/code/modules/mob/living/carbon/alien/alien_base.dm b/code/modules/mob/living/carbon/alien/alien_base.dm index 97559889b956..c4a3b3ab08c8 100644 --- a/code/modules/mob/living/carbon/alien/alien_base.dm +++ b/code/modules/mob/living/carbon/alien/alien_base.dm @@ -91,7 +91,7 @@ // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt. if(bodytemperature > 360.15) //Body temperature is too hot. - throw_alert("alien_fire", /obj/screen/alert/alien_fire) + throw_alert("alien_fire", /atom/movable/screen/alert/alien_fire) switch(bodytemperature) if(360 to 400) apply_damage(HEAT_DAMAGE_LEVEL_1, BURN) diff --git a/code/modules/mob/living/carbon/alien/alien_life.dm b/code/modules/mob/living/carbon/alien/alien_life.dm index 4c13daa7af00..962971a4b21e 100644 --- a/code/modules/mob/living/carbon/alien/alien_life.dm +++ b/code/modules/mob/living/carbon/alien/alien_life.dm @@ -15,7 +15,7 @@ if(Toxins_pp > tox_detect_threshold) // Detect toxins in air add_plasma(breath.toxins * 250) - throw_alert("alien_tox", /obj/screen/alert/alien_tox) + throw_alert("alien_tox", /atom/movable/screen/alert/alien_tox) toxins_used = breath.toxins diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index 70f37d83d213..f95bedded46e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -72,7 +72,7 @@ /mob/living/carbon/alien/humanoid/update_inv_wear_suit() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] inv.update_icon() if(wear_suit) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6172ff2d9441..fcec9a24c58a 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -366,7 +366,7 @@ if((E && (E.status & ORGAN_DEAD)) || !.) return FALSE -/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, laser_pointer = FALSE, type = /obj/screen/fullscreen/flash) +/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, laser_pointer = FALSE, type = /atom/movable/screen/fullscreen/flash) //Parent proc checks if a mob can_be_flashed() . = ..() @@ -663,7 +663,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven return /mob/living/carbon/throw_item(atom/target) - if(!target || !isturf(loc) || istype(target, /obj/screen)) + if(!target || !isturf(loc) || is_screen_atom(target)) throw_mode_off() return @@ -750,7 +750,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven clear_alert("legcuffed") if(!legcuffed) return - throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = legcuffed) + throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = legcuffed) if(m_intent != MOVE_INTENT_WALK) m_intent = MOVE_INTENT_WALK if(hud_used?.move_intent) @@ -1057,7 +1057,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven drop_r_hand() drop_l_hand() stop_pulling() - throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = handcuffed) + throw_alert("handcuffed", /atom/movable/screen/alert/restrained/handcuffed, new_master = handcuffed) ADD_TRAIT(src, TRAIT_RESTRAINED, "handcuffed") else REMOVE_TRAIT(src, TRAIT_RESTRAINED, "handcuffed") @@ -1280,9 +1280,9 @@ so that different stomachs can handle things in different ways VB*/ /mob/living/carbon/proc/update_tint() var/tinttotal = get_total_tint() if(tinttotal >= TINT_BLIND) - overlay_fullscreen("tint", /obj/screen/fullscreen/blind) + overlay_fullscreen("tint", /atom/movable/screen/fullscreen/blind) else if(tinttotal >= TINT_IMPAIR) - overlay_fullscreen("tint", /obj/screen/fullscreen/impaired, 2) + overlay_fullscreen("tint", /atom/movable/screen/fullscreen/impaired, 2) else clear_fullscreen("tint", 0) diff --git a/code/modules/mob/living/carbon/carbon_life.dm b/code/modules/mob/living/carbon/carbon_life.dm index c5d4088cdf97..34df76d70673 100644 --- a/code/modules/mob/living/carbon/carbon_life.dm +++ b/code/modules/mob/living/carbon/carbon_life.dm @@ -112,7 +112,7 @@ //CRIT if(!breath || (breath.total_moles() == 0) || !lungs) adjustOxyLoss(1) - throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) return FALSE var/safe_oxy_min = 16 @@ -138,7 +138,7 @@ oxygen_used = breath.oxygen*ratio else adjustOxyLoss(3) - throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) else //Enough oxygen adjustOxyLoss(-5) @@ -167,7 +167,7 @@ if(Toxins_partialpressure > safe_tox_max) var/ratio = (breath.toxins/safe_tox_max) * 10 adjustToxLoss(clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE)) - throw_alert("too_much_tox", /obj/screen/alert/too_much_tox) + throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox) else clear_alert("too_much_tox") @@ -315,7 +315,7 @@ severity = 9 if(-INFINITY to -95) severity = 10 - overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity) + overlay_fullscreen("crit", /atom/movable/screen/fullscreen/crit, severity) else if(stat == CONSCIOUS) if(check_death_method()) clear_fullscreen("crit") @@ -336,7 +336,7 @@ severity = 6 if(45 to INFINITY) severity = 7 - overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity) + overlay_fullscreen("oxy", /atom/movable/screen/fullscreen/oxy, severity) else clear_fullscreen("oxy") @@ -352,7 +352,7 @@ if(45 to 70) severity = 4 if(70 to 85) severity = 5 if(85 to INFINITY) severity = 6 - overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity) + overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity) else clear_fullscreen("brute") diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 5399f6cb059f..f174dd227ca8 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -35,9 +35,9 @@ /mob/living/carbon/proc/update_hands_hud() if(!hud_used) return - var/obj/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND] + var/atom/movable/screen/inventory/R = hud_used.inv_slots[SLOT_HUD_RIGHT_HAND] R?.update_icon() - var/obj/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND] + var/atom/movable/screen/inventory/L = hud_used.inv_slots[SLOT_HUD_LEFT_HAND] L?.update_icon() /mob/living/carbon/update_inv_r_hand(ignore_cuffs) @@ -64,7 +64,7 @@ /mob/living/carbon/update_inv_back() if(client && hud_used && hud_used.inv_slots[SLOT_HUD_BACK]) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BACK] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BACK] inv.update_icon() if(back) diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index c9ccef9f1c0f..d1ecf83ad18a 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -32,16 +32,16 @@ /datum/status_effect/offering_item id = "offering item" duration = 10 SECONDS - alert_type = /obj/screen/alert/status_effect/offering_item + alert_type = /atom/movable/screen/alert/status_effect/offering_item /datum/status_effect/offering_item/on_creation(mob/living/new_owner, receiver_UID, item_UID) . = ..() - var/obj/screen/alert/status_effect/offering_item/offer = linked_alert + var/atom/movable/screen/alert/status_effect/offering_item/offer = linked_alert offer.item_UID = item_UID offer.receiver_UID = receiver_UID -/obj/screen/alert/status_effect/offering_item +/atom/movable/screen/alert/status_effect/offering_item name = "Offering Item" desc = "You're currently offering an item someone. Make sure to keep the item in your hand so they can accept it! Click to stop offering your item." icon_state = "offering_item" @@ -50,7 +50,7 @@ /// UID of the item being given. var/item_UID -/obj/screen/alert/status_effect/offering_item/Click(location, control, params) +/atom/movable/screen/alert/status_effect/offering_item/Click(location, control, params) var/mob/living/carbon/receiver = locateUID(receiver_UID) var/mob/living/carbon/giver = attached_effect.owner var/obj/item/I = locateUID(item_UID) @@ -99,7 +99,7 @@ return // We use UID() here so that the receiver can have more then one give request at one time. // Otherwise, throwing a new "take item" alert would override any current one also named "take item". - receiver.throw_alert("take item [I.UID()]", /obj/screen/alert/take_item, alert_args = list(user, receiver, I)) + receiver.throw_alert("take item [I.UID()]", /atom/movable/screen/alert/take_item, alert_args = list(user, receiver, I)) item_offered = TRUE // TRUE so we don't give them the default chat message in Destroy. to_chat(user, "You offer [I] to [receiver].") qdel(src) @@ -111,7 +111,7 @@ * Alert which appears for a user when another player is attempting to offer them an item. * The user can click the alert to accept, or simply do nothing to not take the item. */ -/obj/screen/alert/take_item +/atom/movable/screen/alert/take_item name = "Take Item" desc = "someone wants to hand you an item!" icon_state = "template" @@ -124,7 +124,7 @@ var/item_UID -/obj/screen/alert/take_item/Initialize(mapload, mob/living/giver, mob/living/receiver, obj/item/I) +/atom/movable/screen/alert/take_item/Initialize(mapload, mob/living/giver, mob/living/receiver, obj/item/I) . = ..() desc = "[giver] wants to hand you \a [I]. Click here to accept it!" giver_UID = giver.UID() @@ -138,13 +138,13 @@ RegisterSignal(giver, list(COMSIG_PARENT_QDELETING, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), COMSIG_CARBON_SWAP_HANDS), PROC_REF(cancel_give)) -/obj/screen/alert/take_item/Destroy() +/atom/movable/screen/alert/take_item/Destroy() var/mob/living/giver = locateUID(giver_UID) giver.remove_status_effect(STATUS_EFFECT_OFFERING_ITEM) return ..() -/obj/screen/alert/take_item/proc/cancel_give() +/atom/movable/screen/alert/take_item/proc/cancel_give() SIGNAL_HANDLER var/mob/living/giver = locateUID(giver_UID) var/mob/living/receiver = locateUID(receiver_UID) @@ -153,7 +153,7 @@ receiver.clear_alert("take item [item_UID]") -/obj/screen/alert/take_item/Click(location, control, params) +/atom/movable/screen/alert/take_item/Click(location, control, params) var/mob/living/receiver = locateUID(receiver_UID) if(receiver.stat != CONSCIOUS) return @@ -178,7 +178,7 @@ receiver.clear_alert("take item [item_UID]") -/obj/screen/alert/take_item/do_timeout(mob/M, category) +/atom/movable/screen/alert/take_item/do_timeout(mob/M, category) var/mob/living/giver = locateUID(giver_UID) var/mob/living/receiver = locateUID(receiver_UID) // Make sure we're still nearby. We don't want to show a message if the giver not near us. diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm index fbbfdba9a7cf..26abf0326957 100644 --- a/code/modules/mob/living/carbon/human/body_accessories.dm +++ b/code/modules/mob/living/carbon/human/body_accessories.dm @@ -83,19 +83,22 @@ GLOBAL_LIST_EMPTY(body_accessory_by_species) return ..() //Tajaran -/datum/body_accessory/tail/wingler_tail // Jay wingler fluff tail +/// Jay wingler fluff tail +/datum/body_accessory/tail/wingler_tail name = "Striped Tail" icon_state = "winglertail" animated_icon_state = "winglertail_a" allowed_species = list("Tajaran") -/datum/body_accessory/tail/tiny //Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. +/// Pretty ambiguous as to what species it belongs to, tail could've been injured or docked. +/datum/body_accessory/tail/tiny name = "Tiny Tail" icon_state = "tiny" animated_icon_state = "tiny_a" allowed_species = list("Vulpkanin", "Tajaran") -/datum/body_accessory/tail/short //Same as above. +/// Same as above. +/datum/body_accessory/tail/short name = "Short Tail" icon_state = "short" animated_icon_state = "short_a" diff --git a/code/modules/mob/living/carbon/human/human_life.dm b/code/modules/mob/living/carbon/human/human_life.dm index f4583c0c60e6..b796502eaa37 100644 --- a/code/modules/mob/living/carbon/human/human_life.dm +++ b/code/modules/mob/living/carbon/human/human_life.dm @@ -148,13 +148,13 @@ switch(S.breathid) if("o2") - throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) if("tox") - throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) + throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox) if("co2") // currently unused - throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) + throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2) if("n2") - throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro) + throw_alert("not_enough_nitro", /atom/movable/screen/alert/not_enough_nitro) return FALSE // USED IN DEATHWHISPERS @@ -217,13 +217,13 @@ var/mult = dna.species.heatmod * physiology.heat_mod if(bodytemperature >= dna.species.heat_level_1 && bodytemperature <= dna.species.heat_level_2) - throw_alert("temp", /obj/screen/alert/hot, 1) + throw_alert("temp", /atom/movable/screen/alert/hot, 1) take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_1, updating_health = TRUE, used_weapon = "High Body Temperature") if(bodytemperature > dna.species.heat_level_2 && bodytemperature <= dna.species.heat_level_3) - throw_alert("temp", /obj/screen/alert/hot, 2) + throw_alert("temp", /atom/movable/screen/alert/hot, 2) take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_2, updating_health = TRUE, used_weapon = "High Body Temperature") if(bodytemperature > dna.species.heat_level_3 && bodytemperature < INFINITY) - throw_alert("temp", /obj/screen/alert/hot, 3) + throw_alert("temp", /atom/movable/screen/alert/hot, 3) if(on_fire) take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_3, updating_health = TRUE, used_weapon = "Fire") else @@ -238,13 +238,13 @@ if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell) && !(HAS_TRAIT(src, TRAIT_RESISTCOLD))) var/mult = dna.species.coldmod * physiology.cold_mod if(bodytemperature >= dna.species.cold_level_2 && bodytemperature <= dna.species.cold_level_1) - throw_alert("temp", /obj/screen/alert/cold, 1) + throw_alert("temp", /atom/movable/screen/alert/cold, 1) take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_1, updating_health = TRUE, used_weapon = "Low Body Temperature") if(bodytemperature >= dna.species.cold_level_3 && bodytemperature < dna.species.cold_level_2) - throw_alert("temp", /obj/screen/alert/cold, 2) + throw_alert("temp", /atom/movable/screen/alert/cold, 2) take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_2, updating_health = TRUE, used_weapon = "Low Body Temperature") if(bodytemperature > -INFINITY && bodytemperature < dna.species.cold_level_3) - throw_alert("temp", /obj/screen/alert/cold, 3) + throw_alert("temp", /atom/movable/screen/alert/cold, 3) take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_3, updating_health = TRUE, used_weapon = "Low Body Temperature") else clear_alert("temp") @@ -262,21 +262,21 @@ if(!HAS_TRAIT(src, TRAIT_RESISTHIGHPRESSURE)) var/pressure_damage = min(((adjusted_pressure / dna.species.hazard_high_pressure) - 1) * PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) * physiology.pressure_mod take_overall_damage(brute=pressure_damage, updating_health = TRUE, used_weapon = "High Pressure") - throw_alert("pressure", /obj/screen/alert/highpressure, 2) + throw_alert("pressure", /atom/movable/screen/alert/highpressure, 2) else clear_alert("pressure") else if(adjusted_pressure >= dna.species.warning_high_pressure) - throw_alert("pressure", /obj/screen/alert/highpressure, 1) + throw_alert("pressure", /atom/movable/screen/alert/highpressure, 1) else if(adjusted_pressure >= dna.species.warning_low_pressure) clear_alert("pressure") else if(adjusted_pressure >= dna.species.hazard_low_pressure) - throw_alert("pressure", /obj/screen/alert/lowpressure, 1) + throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 1) else if(HAS_TRAIT(src, TRAIT_RESISTLOWPRESSURE)) clear_alert("pressure") else take_overall_damage(brute = LOW_PRESSURE_DAMAGE * physiology.pressure_mod, updating_health = TRUE, used_weapon = "Low Pressure") - throw_alert("pressure", /obj/screen/alert/lowpressure, 2) + throw_alert("pressure", /atom/movable/screen/alert/lowpressure, 2) ///FIRE CODE @@ -685,7 +685,7 @@ new_hunger += "/[dna.species.hunger_type]" if(dna.species.hunger_level != new_hunger) dna.species.hunger_level = new_hunger - throw_alert("nutrition", "/obj/screen/alert/hunger/[new_hunger]", icon_override = dna.species.hunger_icon) + throw_alert("nutrition", "/atom/movable/screen/alert/hunger/[new_hunger]", icon_override = dna.species.hunger_icon) /mob/living/carbon/human/handle_random_events() // Puke if toxloss is too high diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index 355ddc11d8c0..e0d6c8ac37fc 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -573,7 +573,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_w_uniform() remove_overlay(UNIFORM_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_JUMPSUIT] if(inv) inv.update_icon() @@ -650,7 +650,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_id() remove_overlay(ID_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_ID] if(inv) inv.update_icon() @@ -666,7 +666,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_gloves() remove_overlay(GLOVES_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLOVES] if(inv) inv.update_icon() @@ -706,7 +706,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) remove_overlay(OVER_MASK_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_GLASSES] if(inv) inv.update_icon() @@ -744,12 +744,12 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_ears() remove_overlay(EARS_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_LEFT_EAR] if(inv) inv.update_icon() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_RIGHT_EAR] if(inv) inv.update_icon() @@ -792,7 +792,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_shoes() remove_overlay(SHOES_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SHOES] if(inv) inv.update_icon() @@ -828,7 +828,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_s_store() remove_overlay(SUIT_STORE_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SUIT_STORE] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_SUIT_STORE] if(inv) inv.update_icon() @@ -850,7 +850,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(HEAD_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_HEAD] if(inv) inv.update_icon() @@ -879,7 +879,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_belt() remove_overlay(BELT_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_BELT] if(inv) inv.update_icon() @@ -905,7 +905,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_suit() remove_overlay(SUIT_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_OUTER_SUIT] if(inv) inv.update_icon() @@ -949,7 +949,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_pockets() if(client && hud_used) - var/obj/screen/inventory/inv + var/atom/movable/screen/inventory/inv inv = hud_used.inv_slots[SLOT_HUD_LEFT_STORE] if(inv) @@ -970,7 +970,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) /mob/living/carbon/human/update_inv_wear_pda() if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_PDA] if(inv) inv.update_icon() @@ -982,7 +982,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) ..() remove_overlay(FACEMASK_LAYER) if(client && hud_used) - var/obj/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK] + var/atom/movable/screen/inventory/inv = hud_used.inv_slots[SLOT_HUD_WEAR_MASK] if(inv) inv.update_icon() if(wear_mask && (istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory))) diff --git a/code/modules/mob/living/carbon/human/human_update_status.dm b/code/modules/mob/living/carbon/human/human_update_status.dm index 0c48d4b5fa1b..855a3d39e747 100644 --- a/code/modules/mob/living/carbon/human/human_update_status.dm +++ b/code/modules/mob/living/carbon/human/human_update_status.dm @@ -13,7 +13,7 @@ /mob/living/carbon/human/update_nearsighted_effects() var/obj/item/clothing/glasses/G = glasses if(HAS_TRAIT(src, TRAIT_NEARSIGHT) && (!istype(G) || !G.prescription)) - overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) + overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1) else clear_fullscreen("nearsighted") diff --git a/code/modules/mob/living/carbon/human/species/diona_species.dm b/code/modules/mob/living/carbon/human/species/diona_species.dm index 4381438edae0..e68698ad4493 100644 --- a/code/modules/mob/living/carbon/human/species/diona_species.dm +++ b/code/modules/mob/living/carbon/human/species/diona_species.dm @@ -93,7 +93,7 @@ if(light_amount > 0) H.clear_alert("nolight") else - H.throw_alert("nolight", /obj/screen/alert/nolight) + H.throw_alert("nolight", /atom/movable/screen/alert/nolight) if(!is_vamp) H.adjust_nutrition(light_amount * 10) @@ -131,7 +131,8 @@ H.set_nutrition(min(H.nutrition + 30, NUTRITION_LEVEL_FULL)) return TRUE -/datum/species/diona/pod //Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions +/// Same name and everything; we want the same limitations on them; we just want their regeneration to kick in at all times and them to have special factions +/datum/species/diona/pod name = "Diomorph" //Seperate name needed else can't select diona period species_traits = list(NO_HAIR, NOT_SELECTABLE) pod = TRUE diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 554048b09f31..ac5c1a5f8e41 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -313,7 +313,7 @@ if(light_amount > 0) H.clear_alert("nolight") else - H.throw_alert("nolight", /obj/screen/alert/nolight) + H.throw_alert("nolight", /atom/movable/screen/alert/nolight) H.adjust_nutrition(light_amount * 10) if(H.nutrition > NUTRITION_LEVEL_ALMOST_FULL) H.set_nutrition(NUTRITION_LEVEL_ALMOST_FULL) diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm index 660c0f4dafbb..24ff15da2012 100644 --- a/code/modules/mob/living/carbon/human/species/shadow.dm +++ b/code/modules/mob/living/carbon/human/species/shadow.dm @@ -34,9 +34,9 @@ light_amount = T.get_lumcount() * 10 if(light_amount > 2) //if there's enough light, start dying - H.take_overall_damage(1,1) - H.throw_alert("lightexposure", /obj/screen/alert/lightexposure) + H.take_overall_damage(1, 1) + H.throw_alert("lightexposure", /atom/movable/screen/alert/lightexposure) else if(light_amount < 2) //heal in the dark - H.heal_overall_damage(1,1) + H.heal_overall_damage(1, 1) H.clear_alert("lightexposure") ..() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9d8e832a937e..bb28b7d0ab7e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -799,7 +799,7 @@ if(has_gravity) clear_alert("weightless") else - throw_alert("weightless", /obj/screen/alert/weightless) + throw_alert("weightless", /atom/movable/screen/alert/weightless) if(!flying) float(!has_gravity) @@ -829,7 +829,7 @@ return TRUE //called when the mob receives a bright flash -/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, laser_pointer = FALSE, type = /obj/screen/fullscreen/flash) +/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, laser_pointer = FALSE, type = /atom/movable/screen/fullscreen/flash) if(can_be_flashed(intensity, override_blindness_check)) overlay_fullscreen("flash", type) addtimer(CALLBACK(src, PROC_REF(clear_fullscreen), "flash", 25), 25) @@ -1146,7 +1146,7 @@ /mob/living/proc/set_forced_look(atom/A, track = FALSE) forced_look = track ? A.UID() : get_cardinal_dir(src, A) to_chat(src, "You are now facing [track ? A : dir2text(forced_look)]. To cancel this, shift-middleclick yourself.") - throw_alert("direction_lock", /obj/screen/alert/direction_lock) + throw_alert("direction_lock", /atom/movable/screen/alert/direction_lock) /** * Clears the mob's direction lock if enabled. diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 7d4046935e9e..9cfdcaebb15c 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -163,7 +163,7 @@ on_fire = TRUE visible_message("[src] catches fire!", "You're set on fire!") set_light(light_range + 3,l_color = "#ED9200") - throw_alert("fire", /obj/screen/alert/fire) + throw_alert("fire", /atom/movable/screen/alert/fire) update_fire() SEND_SIGNAL(src, COMSIG_LIVING_IGNITED) return TRUE diff --git a/code/modules/mob/living/living_life.dm b/code/modules/mob/living/living_life.dm index 39f9fd35f7eb..59b1b5a7c043 100644 --- a/code/modules/mob/living/living_life.dm +++ b/code/modules/mob/living/living_life.dm @@ -173,6 +173,6 @@ healths.icon_state = "health7" severity = 6 if(severity > 0) - overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity) + overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity) else clear_fullscreen("brute") diff --git a/code/modules/mob/living/living_update_status.dm b/code/modules/mob/living/living_update_status.dm index d84ec9817c07..041d28afdf38 100644 --- a/code/modules/mob/living/living_update_status.dm +++ b/code/modules/mob/living/living_update_status.dm @@ -1,8 +1,8 @@ /mob/living/update_blind_effects() if(!has_vision(information_only=TRUE)) - overlay_fullscreen("blind", /obj/screen/fullscreen/blind) - throw_alert("blind", /obj/screen/alert/blind) - return 1 + overlay_fullscreen("blind", /atom/movable/screen/fullscreen/blind) + throw_alert("blind", /atom/movable/screen/alert/blind) + return TRUE else clear_fullscreen("blind") clear_alert("blind") @@ -19,8 +19,8 @@ /mob/living/update_druggy_effects() if(AmountDruggy()) - overlay_fullscreen("high", /obj/screen/fullscreen/high) - throw_alert("high", /obj/screen/alert/high) + overlay_fullscreen("high", /atom/movable/screen/fullscreen/high) + throw_alert("high", /atom/movable/screen/alert/high) sound_environment_override = SOUND_ENVIRONMENT_DRUGGED else clear_fullscreen("high") @@ -29,14 +29,14 @@ /mob/living/update_nearsighted_effects() if(HAS_TRAIT(src, TRAIT_NEARSIGHT)) - overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) + overlay_fullscreen("nearsighted", /atom/movable/screen/fullscreen/impaired, 1) else clear_fullscreen("nearsighted") /mob/living/update_sleeping_effects(no_alert = FALSE) if(IsSleeping()) if(!no_alert) - throw_alert("asleep", /obj/screen/alert/asleep) + throw_alert("asleep", /atom/movable/screen/alert/asleep) else clear_alert("asleep") diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm index d1257aaf2677..e1e39b605bf4 100644 --- a/code/modules/mob/living/silicon/ai/ai_mob.dm +++ b/code/modules/mob/living/silicon/ai/ai_mob.dm @@ -1539,7 +1539,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list( SEND_SOUND(src, sound('sound/machines/ai_start.ogg')) - var/obj/screen/text/blurb/location_blurb = new() + var/atom/movable/screen/text/blurb/location_blurb = new() location_blurb.maptext_x = 80 location_blurb.maptext_y = 16 location_blurb.maptext_width = 480 diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 92319021efc9..e19be02507fd 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -1,6 +1,7 @@ //Simple borg hand. //Limited use. -/obj/item/gripper_engineering // This isn't a drone item, also in engineering cyborg kits +/// This isn't a drone item, also in engineering cyborg kits +/obj/item/gripper_engineering name = "magnetic gripper" desc = "A simple grasping tool for synthetic assets." icon = 'icons/obj/device.dmi' diff --git a/code/modules/mob/living/silicon/robot/robot_life.dm b/code/modules/mob/living/silicon/robot/robot_life.dm index 1a16490ed96d..2b0be3f6afc1 100644 --- a/code/modules/mob/living/silicon/robot/robot_life.dm +++ b/code/modules/mob/living/silicon/robot/robot_life.dm @@ -63,7 +63,7 @@ emagged = new_state update_icons() if(emagged) - throw_alert("hacked", /obj/screen/alert/hacked) + throw_alert("hacked", /atom/movable/screen/alert/hacked) else clear_alert("hacked") @@ -98,15 +98,15 @@ if(0.75 to INFINITY) clear_alert("charge") if(0.5 to 0.75) - throw_alert("charge", /obj/screen/alert/lowcell, 1) + throw_alert("charge", /atom/movable/screen/alert/lowcell, 1) if(0.25 to 0.5) - throw_alert("charge", /obj/screen/alert/lowcell, 2) + throw_alert("charge", /atom/movable/screen/alert/lowcell, 2) if(0.01 to 0.25) - throw_alert("charge", /obj/screen/alert/lowcell, 3) + throw_alert("charge", /atom/movable/screen/alert/lowcell, 3) else - throw_alert("charge", /obj/screen/alert/emptycell) + throw_alert("charge", /atom/movable/screen/alert/emptycell) else - throw_alert("charge", /obj/screen/alert/nocell) + throw_alert("charge", /atom/movable/screen/alert/nocell) diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm index 90e501f99ab0..13a3652075ca 100644 --- a/code/modules/mob/living/silicon/robot/robot_mob.dm +++ b/code/modules/mob/living/silicon/robot/robot_mob.dm @@ -19,15 +19,15 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( var/custom_sprite = FALSE //Due to all the sprites involved, a var for our custom borgs may be best //Hud stuff - var/obj/screen/hands = null - var/obj/screen/inv1 = null - var/obj/screen/inv2 = null - var/obj/screen/inv3 = null - var/obj/screen/lamp_button = null - var/obj/screen/thruster_button = null + var/atom/movable/screen/hands = null + var/atom/movable/screen/inv1 = null + var/atom/movable/screen/inv2 = null + var/atom/movable/screen/inv3 = null + var/atom/movable/screen/lamp_button = null + var/atom/movable/screen/thruster_button = null var/shown_robot_modules = FALSE //Used to determine whether they have the module menu shown or not - var/obj/screen/robot_modules_background + var/atom/movable/screen/robot_modules_background //3 Modules can be activated at any one time. var/obj/item/robot_module/module = null @@ -1296,7 +1296,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( if(wires.is_cut(WIRE_BORG_LOCKED)) state = 1 if(state) - throw_alert("locked", /obj/screen/alert/locked) + throw_alert("locked", /atom/movable/screen/alert/locked) else clear_alert("locked") lockcharge = state diff --git a/code/modules/mob/living/silicon/silicon_laws.dm b/code/modules/mob/living/silicon/silicon_laws.dm index af3385c28f12..d7c9b0503311 100644 --- a/code/modules/mob/living/silicon/silicon_laws.dm +++ b/code/modules/mob/living/silicon/silicon_laws.dm @@ -10,7 +10,7 @@ return laws.zeroth_law != null /mob/living/silicon/proc/set_zeroth_law(law, law_borg) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.set_zeroth_law(law, law_borg) if(!isnull(usr) && law) @@ -22,56 +22,56 @@ to_chat(src, "Internal camera is currently being accessed.") /mob/living/silicon/proc/add_ion_law(law) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.add_ion_law(law) if(!isnull(usr) && law) log_and_message_admins("has given [src] the ion law: [law]") /mob/living/silicon/proc/add_inherent_law(law) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.add_inherent_law(law) if(!isnull(usr) && law) log_and_message_admins("has given [src] the inherent law: [law]") /mob/living/silicon/proc/add_supplied_law(number, law) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.add_supplied_law(number, law) if(!isnull(usr) && law) log_and_message_admins("has given [src] the supplied law: [law]") /mob/living/silicon/proc/delete_law(datum/ai_law/law) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.delete_law(law) if(!isnull(usr) && law) log_and_message_admins("has deleted a law belonging to [src]: [law.law]") /mob/living/silicon/proc/clear_inherent_laws(silent = 0) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.clear_inherent_laws() if(!silent && !isnull(usr)) log_and_message_admins("cleared the inherent laws of [src]") /mob/living/silicon/proc/clear_ion_laws(silent = 0) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.clear_ion_laws() if(!silent && !isnull(usr)) log_and_message_admins("cleared the ion laws of [src]") /mob/living/silicon/proc/clear_supplied_laws(silent = 0) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.clear_supplied_laws() if(!silent && !isnull(usr)) log_and_message_admins("cleared the supplied laws of [src]") /mob/living/silicon/proc/clear_zeroth_law(silent = FALSE) - throw_alert("newlaw", /obj/screen/alert/newlaw) + throw_alert("newlaw", /atom/movable/screen/alert/newlaw) laws_sanity_check() laws.clear_zeroth_laws() if(!silent && !isnull(usr)) diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm index 9dd4a655f421..1b0a20083be8 100644 --- a/code/modules/mob/living/silicon/silicon_mob.dm +++ b/code/modules/mob/living/silicon/silicon_mob.dm @@ -409,7 +409,7 @@ /mob/living/silicon/get_access() return IGNORE_ACCESS //silicons always have access -/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/noise) +/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash/noise) if(affect_silicon) return ..() diff --git a/code/modules/mob/living/simple_animal/bot/griefsky.dm b/code/modules/mob/living/simple_animal/bot/griefsky.dm index 2530633daa34..37406b435e55 100644 --- a/code/modules/mob/living/simple_animal/bot/griefsky.dm +++ b/code/modules/mob/living/simple_animal/bot/griefsky.dm @@ -1,4 +1,5 @@ -/mob/living/simple_animal/bot/secbot/griefsky //This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. +/// This bot is powerful. If you managed to get 4 eswords somehow, you deserve this horror. Emag him for best results. +/mob/living/simple_animal/bot/secbot/griefsky name = "\improper General Griefsky" desc = "Is that a secbot with four eswords in its arms...?" icon_state = "griefsky0" @@ -18,7 +19,8 @@ var/spam_flag = 0 var/frustration_number = 15 -/mob/living/simple_animal/bot/secbot/griefsky/toy //A toy version of general griefsky! +/// A toy version of general griefsky! +/mob/living/simple_animal/bot/secbot/griefsky/toy name = "Genewul Giftskee" desc = "An adorable looking secbot with four toy swords taped to its arms" spin_icon = "griefskyj-c" diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 093d9ccb1dac..8f118b1a0591 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/bot/honkbot - name = "\improper honkbot" + name = "honkbot" desc = "A little robot. It looks happy with its bike horn." icon = 'icons/obj/aibots.dmi' icon_state = "honkbot" diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 1e74d1162df1..c1187ee2682e 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -123,7 +123,7 @@ /mob/living/simple_animal/hostile/construct/Life(seconds, times_fired) if(holy_check(src)) - throw_alert("holy_fire", /obj/screen/alert/holy_fire, override = TRUE) + throw_alert("holy_fire", /atom/movable/screen/alert/holy_fire, override = TRUE) visible_message("[src] slowly crumbles to dust in this holy place!", \ "Your shell burns as you crumble to dust in this holy place!") playsound(loc, 'sound/items/welder.ogg', 150, TRUE) @@ -162,7 +162,8 @@ playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ create shield walls, rip apart enemies and walls." -/mob/living/simple_animal/hostile/construct/armoured/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/armoured/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP @@ -195,10 +196,12 @@ retreat_distance = 2 //AI wraiths will move in and out of combat playstyle_string = "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." -/mob/living/simple_animal/hostile/construct/wraith/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/wraith/hostile AIStatus = AI_ON -/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum //Used in bubblegum summoning. Needs MOB_SIZE_LARGE so crushers don't suffer +/// Used in bubblegum summoning. Needs MOB_SIZE_LARGE so crushers don't suffer +/mob/living/simple_animal/hostile/construct/wraith/hostile/bubblegum mob_size = MOB_SIZE_LARGE /////////////////////////////Artificer///////////////////////// @@ -276,7 +279,8 @@ retreat_distance = initial(retreat_distance) minimum_distance = initial(minimum_distance) -/mob/living/simple_animal/hostile/construct/builder/hostile //actually hostile, will move around, hit things, heal other constructs +/// actually hostile, will move around, hit things, heal other constructs +/mob/living/simple_animal/hostile/construct/builder/hostile AIStatus = AI_ON environment_smash = ENVIRONMENT_SMASH_STRUCTURES //only token destruction, don't smash the cult wall NO STOP @@ -306,7 +310,8 @@ var/energy = 0 var/max_energy = 1000 -/mob/living/simple_animal/hostile/construct/behemoth/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/behemoth/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP @@ -340,7 +345,8 @@ return TRUE -/mob/living/simple_animal/hostile/construct/harvester/hostile //actually hostile, will move around, hit things +/// actually hostile, will move around, hit things +/mob/living/simple_animal/hostile/construct/harvester/hostile AIStatus = AI_ON environment_smash = 1 //only token destruction, don't smash the cult wall NO STOP diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm index 00099deea275..ff76eef39575 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm @@ -107,8 +107,8 @@ if(isdiona(M)) to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") - throw_alert(GESTALT_ALERT, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist - M.throw_alert(NYMPH_ALERT, /obj/screen/alert/gestalt, new_master = src) + throw_alert(GESTALT_ALERT, /atom/movable/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + M.throw_alert(NYMPH_ALERT, /atom/movable/screen/alert/gestalt, new_master = src) forceMove(M) else if(isrobot(M)) M.visible_message("[M] playfully boops [src] on the head!", "You playfully boop [src] on the head!") @@ -141,8 +141,8 @@ M.status_flags |= PASSEMOTES to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") forceMove(M) - throw_alert(GESTALT_ALERT, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist - M.throw_alert(NYMPH_ALERT, /obj/screen/alert/gestalt, new_master = src) + throw_alert(GESTALT_ALERT, /atom/movable/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + M.throw_alert(NYMPH_ALERT, /atom/movable/screen/alert/gestalt, new_master = src) return TRUE else return FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 4cd1f666d0b3..af1762e3bcca 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -64,7 +64,7 @@ //Corgis and pugs are now under one dog subtype /mob/living/simple_animal/pet/dog/corgi - name = "\improper corgi" + name = "corgi" real_name = "corgi" desc = "It's a corgi." icon_state = "corgi" @@ -632,7 +632,7 @@ adjustBruteLoss(-maxHealth) /mob/living/simple_animal/pet/dog/corgi/puppy - name = "\improper corgi puppy" + name = "corgi puppy" real_name = "corgi" desc = "It's a corgi puppy!" icon_state = "puppy" @@ -647,8 +647,9 @@ // Puppies do not have a head or back equipment slot. return "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]" -/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace - name = "\improper void puppy" +/// Tribute to the corgis born in nullspace +/mob/living/simple_animal/pet/dog/corgi/puppy/void + name = "void puppy" real_name = "voidy" desc = "A corgi puppy that has been infused with deep space energy. It's staring back..." icon_state = "void_puppy" @@ -776,7 +777,7 @@ ///Pugs /mob/living/simple_animal/pet/dog/pug - name = "\improper pug" + name = "pug" real_name = "pug" desc = "It's a pug." icon = 'icons/mob/pets.dmi' diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index f8aa127e2a87..cc34a767dea6 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -1,6 +1,6 @@ //goat /mob/living/simple_animal/hostile/retaliate/goat - name = "\improper goat" + name = "goat" desc = "Not known for their pleasant disposition." icon_state = "goat" icon_living = "goat" @@ -109,7 +109,7 @@ //cow /mob/living/simple_animal/cow - name = "\improper cow" + name = "cow" desc = "Known for their milk, just don't tip them over." icon_state = "cow" icon_living = "cow" @@ -187,7 +187,7 @@ return FALSE /mob/living/simple_animal/chick - name = "\improper chick" + name = "chick" desc = "Adorable! They make such a racket though." icon_state = "chick" icon_living = "chick" @@ -241,7 +241,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) /mob/living/simple_animal/chicken - name = "\improper chicken" + name = "chicken" desc = "Hopefully the eggs are good this season." gender = FEMALE mob_biotypes = MOB_ORGANIC | MOB_BEAST @@ -368,7 +368,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) return FALSE /mob/living/simple_animal/pig - name = "\improper pig" + name = "pig" desc = "Oink oink." icon_state = "pig" icon_living = "pig" @@ -394,7 +394,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_SHOE /mob/living/simple_animal/turkey - name = "\improper turkey" + name = "turkey" desc = "Benjamin Franklin would be proud." icon_state = "turkey" icon_living = "turkey" @@ -419,7 +419,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_CLAW /mob/living/simple_animal/goose - name = "\improper goose" + name = "goose" desc = "A pretty goose. Would make a nice comforter." icon_state = "goose" icon_living = "goose" @@ -444,7 +444,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) footstep_type = FOOTSTEP_MOB_CLAW /mob/living/simple_animal/seal - name = "\improper seal" + name = "seal" desc = "A beautiful white seal." icon_state = "seal" icon_living = "seal" @@ -469,7 +469,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) blood_volume = BLOOD_VOLUME_NORMAL /mob/living/simple_animal/walrus - name = "\improper walrus" + name = "walrus" desc = "A big brown walrus." icon_state = "walrus" icon_living = "walrus" diff --git a/code/modules/mob/living/simple_animal/hostile/bat.dm b/code/modules/mob/living/simple_animal/hostile/bat.dm index 66f76186713d..c0d064319dd4 100644 --- a/code/modules/mob/living/simple_animal/hostile/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/bat.dm @@ -1,5 +1,5 @@ /mob/living/simple_animal/hostile/scarybat - name = "\improper space bats" + name = "space bats" desc = "A swarm of cute little blood sucking bats that looks pretty pissed." icon = 'icons/mob/bats.dmi' icon_state = "bat" diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm index f3982ed9a974..b81f9c2dff4a 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm @@ -3,7 +3,7 @@ //*********// /mob/living/simple_animal/hostile/panther - name = "\improper panther" + name = "panther" desc = "A long sleek, black cat with sharp teeth and claws." icon = 'icons/mob/alienqueen.dmi' icon_state = "panther" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm index e1e4d06f04da..76469fd93569 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm @@ -784,7 +784,8 @@ Difficulty: Hard duration = 20 -/obj/item/projectile/energy/tesla_bolt //Leaving here for adminbus / so vetus still uses it. +/// Leaving here for adminbus / so vetus still uses it. +/obj/item/projectile/energy/tesla_bolt name = "shock bolt" icon_state = "purple_laser" impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser @@ -810,7 +811,8 @@ Difficulty: Hard var/turf/target_turf = get_turf(A) loc = target_turf -/obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot //this is the worst path I have ever made +/// this is the worst path I have ever made +/obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot icon_state = "target" /obj/effect/temp_visual/dragon_swoop/bubblegum/ancient_robot/Initialize(mapload, target) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index 3515e72c7881..7a29e37406a3 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -110,7 +110,8 @@ Difficulty: Medium shoot_ka() transform_weapon() -/obj/item/melee/energy/cleaving_saw/miner //nerfed saw because it is very murdery +/// nerfed saw because it is very murdery +/obj/item/melee/energy/cleaving_saw/miner force = 6 force_on = 10 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 55cd79a6d15b..a4601d9bfff6 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -141,7 +141,7 @@ Difficulty: Hard H.apply_status_effect(STATUS_EFFECT_BUBBLEGUM_CURSE, src) if(second_life) H.clear_fullscreen("Bubblegum") - H.overlay_fullscreen("Bubblegum", /obj/screen/fullscreen/fog, 2) + H.overlay_fullscreen("Bubblegum", /atom/movable/screen/fullscreen/fog, 2) /mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index d2a79230e927..2ef2491296ed 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -577,7 +577,8 @@ Difficulty: Hard var/turf/simulated/mineral/M = loc M.gets_drilled(caster) -/obj/effect/temp_visual/hierophant/wall //smoothing and pooling were not friends, but pooling is dead. +/// smoothing and pooling were not friends, but pooling is dead. +/obj/effect/temp_visual/hierophant/wall name = "vortex wall" icon = 'icons/turf/walls/hierophant_wall_temp.dmi' icon_state = "hierophant_wall_temp-0" @@ -612,7 +613,8 @@ Difficulty: Hard return TRUE return FALSE -/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. +/// a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds. +/obj/effect/temp_visual/hierophant/chaser duration = 98 var/mob/living/target //what it's following var/turf/targetturf //what turf the target is actually on diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm index 1aa4eb05f49f..53e5e125a1a0 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/retaliate/carp - name = "\improper sea carp" + name = "sea carp" desc = "A large fish bearing similarities to a certain space-faring menace." icon = 'icons/mob/carp.dmi' icon_state = "carp" diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 39b5bc47bd68..a6a840906f83 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -1,6 +1,7 @@ -/obj/structure/alien/resin/flower_bud_enemy //inheriting basic attack/damage stuff from alien structures +/// inheriting basic attack/damage stuff from alien structures +/obj/structure/alien/resin/flower_bud_enemy name = "flower bud" desc = "A large pulsating plant..." icon = 'icons/effects/spacevines.dmi' diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index 2ba65d00bf45..845b8bf461f9 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -89,7 +89,8 @@ new next_stage(get_turf(src)) qdel(src) //hide the body -/mob/living/simple_animal/hostile/winter/santa/stage_1 //stage 1: slow melee +/// stage 1: slow melee +/mob/living/simple_animal/hostile/winter/santa/stage_1 maxHealth = 150 health = 150 desc = "GET THE FAT MAN!" @@ -99,7 +100,8 @@ melee_damage_lower = 10 melee_damage_upper = 20 -/mob/living/simple_animal/hostile/winter/santa/stage_2 //stage 2: slow ranged +/// stage 2: slow ranged +/mob/living/simple_animal/hostile/winter/santa/stage_2 desc = "GET THE FAT MAN AGAIN!" next_stage = /mob/living/simple_animal/hostile/winter/santa/stage_3 death_message = "YOU'VE BEEN VERY NAUGHTY! PREPARE TO DIE!" @@ -110,7 +112,8 @@ retreat_distance = 5 minimum_distance = 5 -/mob/living/simple_animal/hostile/winter/santa/stage_3 //stage 3: fast rapidfire ranged +/// stage 3: fast rapidfire ranged +/mob/living/simple_animal/hostile/winter/santa/stage_3 desc = "WHY WON'T HE DIE ALREADY!?" next_stage = /mob/living/simple_animal/hostile/winter/santa/stage_4 death_message = "FACE MY FINAL FORM AND KNOW DESPAIR!" @@ -123,7 +126,8 @@ retreat_distance = 3 minimum_distance = 3 -/mob/living/simple_animal/hostile/winter/santa/stage_4 //stage 4: fast spinebreaker +/// stage 4: fast spinebreaker +/mob/living/simple_animal/hostile/winter/santa/stage_4 name = "Final Form Santa" desc = "WHAT THE HELL IS HE!?! WHY WON'T HE STAY DEAD!?!" maxHealth = 300 //YOU FACE JARAX- I MEAN SANTA! diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 767cdf87a6af..9c42fa54e10d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -305,20 +305,20 @@ if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"]) atmos_suitable = 0 - throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) else if(atmos_requirements["max_oxy"] && oxy > atmos_requirements["max_oxy"]) atmos_suitable = 0 - throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy) + throw_alert("too_much_oxy", /atom/movable/screen/alert/too_much_oxy) else clear_alert("not_enough_oxy") clear_alert("too_much_oxy") if(atmos_requirements["min_tox"] && tox < atmos_requirements["min_tox"]) atmos_suitable = 0 - throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) + throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox) else if(atmos_requirements["max_tox"] && tox > atmos_requirements["max_tox"]) atmos_suitable = 0 - throw_alert("too_much_tox", /obj/screen/alert/too_much_tox) + throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox) else clear_alert("too_much_tox") clear_alert("not_enough_tox") diff --git a/code/modules/mob/living/simple_animal/slime/slime_life.dm b/code/modules/mob/living/simple_animal/slime/slime_life.dm index 8617910d8fa0..67d15345bea2 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_life.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_life.dm @@ -114,7 +114,7 @@ if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc if(bodytemperature <= (T0C - 40)) // stun temperature Tempstun = TRUE - throw_alert("temp", /obj/screen/alert/cold, 3) + throw_alert("temp", /atom/movable/screen/alert/cold, 3) to_chat(src,"You suddenly freeze up, you cannot move!") if(bodytemperature <= (T0C - 50)) // hurt temperature diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm index 4db2674ec93a..4b12a386e3ea 100644 --- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm +++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm @@ -193,7 +193,7 @@ healths.icon_state = "slime_health7" severity = 6 if(severity > 0) - overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity) + overlay_fullscreen("brute", /atom/movable/screen/fullscreen/brute, severity) else clear_fullscreen("brute") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 17e28d7695b5..bbc6d76f3c1d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1490,14 +1490,14 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ /mob/proc/sync_lighting_plane_alpha() if(hud_used) - var/obj/screen/plane_master/lighting/L = hud_used.plane_masters["[LIGHTING_PLANE]"] + var/atom/movable/screen/plane_master/lighting/L = hud_used.plane_masters["[LIGHTING_PLANE]"] if(L) L.alpha = lighting_alpha sync_nightvision_screen() //Sync up the overlay used for nightvision to the amount of see_in_dark a mob has. This needs to be called everywhere sync_lighting_plane_alpha() is. /mob/proc/sync_nightvision_screen() - var/obj/screen/fullscreen/see_through_darkness/S = screens["see_through_darkness"] + var/atom/movable/screen/fullscreen/see_through_darkness/S = screens["see_through_darkness"] if(S) var/suffix = "" switch(see_in_dark) diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index ca1b4c9aad76..c501c3ee4d06 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -11,7 +11,7 @@ /obj/item/grab name = "grab" flags = NOBLUDGEON | ABSTRACT | DROPDEL - var/obj/screen/grab/hud = null + var/atom/movable/screen/grab/hud = null var/mob/living/affecting = null var/mob/living/assailant = null var/state = GRAB_PASSIVE @@ -48,7 +48,7 @@ RegisterSignal(affecting, COMSIG_MOVABLE_MOVED, PROC_REF(grab_moved)) RegisterSignal(assailant, COMSIG_MOVABLE_MOVED, PROC_REF(pull_grabbed)) - hud = new /obj/screen/grab(src) + hud = new /atom/movable/screen/grab(src) hud.icon_state = "reinforce" icon_state = "grabbed" hud.name = "reinforce grab" @@ -291,7 +291,7 @@ if(EAST) animate(affecting, pixel_x =-shift, pixel_y = 0, 5, 1, LINEAR_EASING) -/obj/item/grab/proc/s_click(obj/screen/S) +/obj/item/grab/proc/s_click(atom/movable/screen/S) if(!affecting) return if(state >= GRAB_AGGRESSIVE && HAS_TRAIT(assailant, TRAIT_PACIFISM)) diff --git a/code/modules/mob/mob_misc_procs.dm b/code/modules/mob/mob_misc_procs.dm index 0be10259ed66..8acc9b1e49e1 100644 --- a/code/modules/mob/mob_misc_procs.dm +++ b/code/modules/mob/mob_misc_procs.dm @@ -554,7 +554,7 @@ if(flashwindow) window_flash(O.client) if(source) - var/obj/screen/alert/notify_action/A = O.throw_alert("\ref[source]_notify_action", /obj/screen/alert/notify_action) + var/atom/movable/screen/alert/notify_action/A = O.throw_alert("\ref[source]_notify_action", /atom/movable/screen/alert/notify_action) if(A) if(O.client.prefs && O.client.prefs.UI_style) A.icon = ui_style2icon(O.client.prefs.UI_style) diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 6de1b1b4d79f..3a354a4e4c0f 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -383,7 +383,7 @@ return /client/proc/check_has_body_select() - return mob && mob.hud_used && mob.hud_used.zone_select && istype(mob.hud_used.zone_select, /obj/screen/zone_sel) + return mob && mob.hud_used && mob.hud_used.zone_select && istype(mob.hud_used.zone_select, /atom/movable/screen/zone_sel) /client/verb/body_toggle_head() set name = "body-toggle-head" @@ -401,7 +401,7 @@ else next_in_line = BODY_ZONE_HEAD - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(next_in_line, mob) /client/verb/body_r_arm() @@ -416,7 +416,7 @@ else next_in_line = BODY_ZONE_R_ARM - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(next_in_line, mob) /client/verb/body_chest() @@ -426,7 +426,7 @@ if(!check_has_body_select()) return - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(BODY_ZONE_CHEST, mob) /client/verb/body_l_arm() @@ -442,7 +442,7 @@ else next_in_line = BODY_ZONE_L_ARM - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(next_in_line, mob) /client/verb/body_r_leg() @@ -458,7 +458,7 @@ else next_in_line = BODY_ZONE_R_LEG - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(next_in_line, mob) /client/verb/body_groin() @@ -468,7 +468,7 @@ if(!check_has_body_select()) return - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(BODY_ZONE_PRECISE_GROIN, mob) /client/verb/body_l_leg() @@ -484,7 +484,7 @@ else next_in_line = BODY_ZONE_L_LEG - var/obj/screen/zone_sel/selector = mob.hud_used.zone_select + var/atom/movable/screen/zone_sel/selector = mob.hud_used.zone_select selector.set_selected_zone(next_in_line, mob) /client/verb/toggle_walk_run() @@ -513,5 +513,5 @@ if(hud_used && hud_used.move_intent && hud_used.static_inventory) hud_used.move_intent.icon_state = icon_toggle - for(var/obj/screen/mov_intent/selector in hud_used.static_inventory) + for(var/atom/movable/screen/mov_intent/selector in hud_used.static_inventory) selector.update_icon() diff --git a/code/modules/mob/mob_vars.dm b/code/modules/mob/mob_vars.dm index cfd97814511f..8a0c3c0781a5 100644 --- a/code/modules/mob/mob_vars.dm +++ b/code/modules/mob/mob_vars.dm @@ -13,11 +13,11 @@ /// The zone this mob is currently targeting var/zone_selected = null - var/obj/screen/pullin = null - var/obj/screen/i_select = null - var/obj/screen/m_select = null - var/obj/screen/healths = null - var/obj/screen/throw_icon = null + var/atom/movable/screen/pullin = null + var/atom/movable/screen/i_select = null + var/atom/movable/screen/m_select = null + var/atom/movable/screen/healths = null + var/atom/movable/screen/throw_icon = null /*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob. A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such. @@ -25,8 +25,8 @@ I'll make some notes on where certain variable defines should probably go. Changing this around would probably require a good look-over the pre-existing code. */ - var/obj/screen/leap_icon = null - var/obj/screen/healthdoll/healthdoll = null + var/atom/movable/screen/leap_icon = null + var/atom/movable/screen/healthdoll/healthdoll = null var/use_me = TRUE //Allows all mobs to use the me verb by default, will have to manually specify they cannot var/damageoverlaytemp = 0 @@ -215,7 +215,7 @@ var/suiciding = FALSE /// Used for some screen objects, such as var/list/screens = list() - /// lazy list. contains /obj/screen/alert only, On /mob so clientless mobs will throw alerts properly + /// lazy list. contains /atom/movable/screen/alert only, On /mob so clientless mobs will throw alerts properly var/list/alerts /// Makes items bloody if you touch them var/bloody_hands = 0 diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm index 9dd5345d4837..87cac271a18a 100644 --- a/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/human/human_body_markings.dm @@ -8,7 +8,8 @@ species_allowed = list("Unathi", "Tajaran", "Vulpkanin") icon_state = "tiger" -/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm +/// Tattoos applied post-round startup with tattoo guns in item_defines.dm +/datum/sprite_accessory/body_markings/tattoo species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell") icon_state = "none" @@ -17,7 +18,8 @@ icon_state = "campbell" species_allowed = null -/datum/sprite_accessory/body_markings/tattoo/tiger_body // Yep, this is repeated. To be fixed later +/// Yep, this is repeated. To be fixed later +/datum/sprite_accessory/body_markings/tattoo/tiger_body name = "Tiger-stripe Tattoo" species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell") icon_state = "tiger" diff --git a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm index 27c2ad066b80..9cdfb017e9b4 100644 --- a/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/human/human_hair.dm @@ -762,7 +762,8 @@ icon_state = "father" species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin") -/datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun +/// Due to a vulp hairstyle called bun +/datum/sprite_accessory/hair/bun4 name = "Bun 4" icon_state = "bun4" species_allowed = list("Human", "Slime People", "Unathi", "Tajaran", "Vulpkanin") @@ -854,7 +855,8 @@ ///Fluff HairStyles// -/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human +/// Pineapple Salad hair fluff its for a slime..has to go under human +/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair name = "Sasook Hair" icon_state = "psalad_fluff_hair" species_allowed = list("Slime People") diff --git a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm index ea1176ff7386..72c9dbdc5ed4 100644 --- a/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/shared/shared_tail_markings.dm @@ -1,7 +1,8 @@ /datum/sprite_accessory/body_markings/tail/shared icon = 'icons/mob/sprite_accessories/shared/shared_tail_markings.dmi' -/datum/sprite_accessory/body_markings/tail/shared/short_tip //Species-ambiguous, generic short tail. +/// Species-ambiguous, generic short tail. +/datum/sprite_accessory/body_markings/tail/shared/short_tip name = "Short Tail Tip" species_allowed = list("Vulpkanin", "Tajaran") tails_allowed = list("Short Tail") diff --git a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm index 0846744f0caf..76cbbc7284c9 100644 --- a/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm +++ b/code/modules/mob/new_player/sprite_accessories/skrell/skrell_face.dm @@ -155,7 +155,8 @@ secondary_theme = "fest" no_sec_colour = 1 -/datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle //Zeke Fluff hair +/// Zeke Fluff hair +/datum/sprite_accessory/hair/fluff/zeke_fluff_tentacle icon = 'icons/mob/sprite_accessories/skrell/skrell_hair.dmi' name = "Zekes Tentacles" icon_state = "zeke_fluff_hair" diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm index cf23d358bf04..519b62894bc1 100644 --- a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_head_markings.dm @@ -31,14 +31,17 @@ name = "Tajaran Muzzle and Inner Ears" icon_state = "muzinears" -/datum/sprite_accessory/body_markings/head/tajara/muzzle_alt_taj //Companion marking for Tajaran Belly 2. +/// Companion marking for Tajaran Belly 2. +/datum/sprite_accessory/body_markings/head/tajara/muzzle_alt_taj name = "Tajaran Muzzle 2" icon_state = "muzzle2" -/datum/sprite_accessory/body_markings/head/tajara/points_taj //Companion marking for Tajaran Points. +/// Companion marking for Tajaran Points. +/datum/sprite_accessory/body_markings/head/tajara/points_taj name = "Tajaran Points Head" icon_state = "points" -/datum/sprite_accessory/body_markings/head/tajara/patchy_taj //Companion marking for Tajaran Patches. +/// Companion marking for Tajaran Patches. +/datum/sprite_accessory/body_markings/head/tajara/patchy_taj name = "Tajaran Patches Head" icon_state = "patch" diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm index c8c0d20a6b3e..ce507542afa3 100644 --- a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_tail_markings.dm @@ -2,6 +2,7 @@ icon = 'icons/mob/sprite_accessories/tajaran/tajaran_tail_markings.dmi' species_allowed = list("Tajaran") -/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes //Tiger stripes. +/// Tiger stripes. +/datum/sprite_accessory/body_markings/tail/tajara/taj_wingler_stripes name = "Tajaran Tail Stripes" icon_state = "default_wingler" diff --git a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm index 81eb4356c6ca..beed20524491 100644 --- a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm @@ -3,7 +3,8 @@ species_allowed = list("Unathi") glasses_over = 1 -/datum/sprite_accessory/hair/braid_hip_una // Future coder: Change the typepath under unathi. This is a legacy of my accessories splitting PR where typepath change is avoided at all cost +// Future coder: Change the typepath under unathi. This is a legacy of my accessories splitting PR where typepath change is avoided at all cost +/datum/sprite_accessory/hair/braid_hip_una icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi' name = "Unathi Hippie Braid" icon_state = "hipbraid" diff --git a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm index b410148b0c94..bb416b82f099 100644 --- a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_head_markings.dm @@ -20,16 +20,19 @@ icon_state = "lowersnout" heads_allowed = list("All") -/datum/sprite_accessory/body_markings/head/unathi/banded_una //Companion marking for Unathi Banded. +/// Companion marking for Unathi Banded. +/datum/sprite_accessory/body_markings/head/unathi/banded_una name = "Unathi Banded Head" icon_state = "bandedface" heads_allowed = list("All") -/datum/sprite_accessory/body_markings/head/unathi/snout_narrow_una //Companion marking for Unathi Narrow Belly. +/// Companion marking for Unathi Narrow Belly. +/datum/sprite_accessory/body_markings/head/unathi/snout_narrow_una name = "Unathi Snout 2" icon_state = "facenarrow" -/datum/sprite_accessory/body_markings/head/unathi/points_una //Companion marking for Unathi Points. +/// Companion marking for Unathi Points. +/datum/sprite_accessory/body_markings/head/unathi/points_una name = "Unathi Points Head" icon_state = "pointsface" heads_allowed = list("All") @@ -45,6 +48,7 @@ name = "Unathi Sharp Snout" icon_state = "snoutsharp" -/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_narrow_una_sharp //Companion marking for Unathi Narrow Belly. +/// Companion marking for Unathi Narrow Belly. +/datum/sprite_accessory/body_markings/head/unathi/sharp/snout_narrow_una_sharp name = "Unathi Sharp Snout 2" icon_state = "facesharp" diff --git a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm index e4c54a0b65ee..d48897737c47 100644 --- a/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm +++ b/code/modules/mob/new_player/sprite_accessories/vulpkanin/vulpkanin_head_markings.dm @@ -18,18 +18,22 @@ name = "Vulpkanin Tiger Head and Face" icon_state = "tiger_face" -/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp //Companion marking for Vulpkanin Belly Alt.. +/// Companion marking for Vulpkanin Belly Alt.. +/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp name = "Vulpkanin Muzzle" icon_state = "muzzle" -/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_ears_vulp //Companion marking for Vulpkanin Belly Alt.. +/// Companion marking for Vulpkanin Belly Alt.. +/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_ears_vulp name = "Vulpkanin Muzzle and Ears" icon_state = "muzzle_ear" -/datum/sprite_accessory/body_markings/head/vulpkanin/points_fade_vulp //Companion marking for Vulpkanin Points Fade. +/// Companion marking for Vulpkanin Points Fade. +/datum/sprite_accessory/body_markings/head/vulpkanin/points_fade_vulp name = "Vulpkanin Points Head" icon_state = "points_fade" -/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp //Companion marking for Vulpkanin Points Sharp. +/// Companion marking for Vulpkanin Points Sharp. +/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp name = "Vulpkanin Points Head 2" icon_state = "points_sharp" diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm index e92f9bf41a31..081cbddf0171 100644 --- a/code/modules/mod/mod_construction.dm +++ b/code/modules/mod/mod_construction.dm @@ -63,16 +63,20 @@ /obj/item/mod/construction/plating/cosmohonk theme = /datum/mod_theme/cosmohonk -/obj/item/mod/construction/plating/rescue //I want to add a way to get the rarer modsuit types, that is limited. A low chance for traders to have plating for it seems interesting +/// I want to add a way to get the rarer modsuit types, that is limited. A low chance for traders to have plating for it seems interesting +/obj/item/mod/construction/plating/rescue theme = /datum/mod_theme/rescue -/obj/item/mod/construction/plating/safeguard //Continued from above, none of these are steal objectives, and only the CE or RD one comes pre-installed with modules. You are getting the protection / speed / looks of these hardsuits, but no special modules. +/// Continued from above, none of these are steal objectives, and only the CE or RD one comes pre-installed with modules. You are getting the protection / speed / looks of these hardsuits, but no special modules. +/obj/item/mod/construction/plating/safeguard theme = /datum/mod_theme/safeguard -/obj/item/mod/construction/plating/advanced //This may be a bad idea. I think this is an interesting idea. And you still need robotics to build it, and traders can charge as much for it as they want. Also with ones like the CE modsuit, it is the flagship mod. That means it is sold a lot. +/// This may be a bad idea. I think this is an interesting idea. And you still need robotics to build it, and traders can charge as much for it as they want. Also with ones like the CE modsuit, it is the flagship mod. That means it is sold a lot. +/obj/item/mod/construction/plating/advanced theme = /datum/mod_theme/advanced -/obj/item/mod/construction/plating/research //Don't think people will want the RD one though, it is as slow as shit. Anyway, here it is. Surely this will not end poorly. +/// Don't think people will want the RD one though, it is as slow as shit. Anyway, here it is. Surely this will not end poorly. +/obj/item/mod/construction/plating/research theme = /datum/mod_theme/research #define START_STEP "start" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 6cd38c1bec97..1064d5f79455 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -268,7 +268,7 @@ if(!M.restrained() && !M.stat) playsound(loc, "rustle", 50, TRUE, -5) - if(istype(over_object, /obj/screen/inventory/hand)) + if(istype(over_object, /atom/movable/screen/inventory/hand)) for(var/obj/item/part as anything in mod_parts) if(part.loc != src) to_chat(wearer, "Retract parts first!") @@ -657,7 +657,7 @@ if(!wearer) return if(!core) - wearer.throw_alert("mod_charge", /obj/screen/alert/nocell) + wearer.throw_alert("mod_charge", /atom/movable/screen/alert/nocell) return core.update_charge_alert() diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 2dbd92afebc3..62a214ce072c 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -44,7 +44,8 @@ /obj/item/mod/core/proc/update_charge_alert() mod.wearer.clear_alert("mod_charge") -/obj/item/mod/core/infinite //Admin only. +/// Admin only. +/obj/item/mod/core/infinite name = "MOD infinite core" icon_state = "mod-core-infinite" desc = "A fusion core using the rare Infinium to sustain enough energy for the lifetime of the MOD's user. \ @@ -130,20 +131,20 @@ /obj/item/mod/core/standard/update_charge_alert() var/obj/item/stock_parts/cell/charge_source = charge_source() if(!charge_source) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/nocell) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/nocell) return var/remaining_cell = charge_amount() / max_charge_amount() switch(remaining_cell) if(0.75 to INFINITY) mod.wearer.clear_alert("mod_charge") if(0.5 to 0.75) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 1) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 1) if(0.25 to 0.5) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 2) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 2) if(0.01 to 0.25) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 3) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 3) else - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/emptycell) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/emptycell) /obj/item/mod/core/standard/emp_act(severity) cell?.emp_act(severity) @@ -275,13 +276,13 @@ if(0.75 to INFINITY) mod.wearer.clear_alert("mod_charge") if(0.5 to 0.75) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 1) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 1) if(0.25 to 0.5) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 2) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 2) if(0.01 to 0.25) - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/lowcell, 3) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/lowcell, 3) else - mod.wearer.throw_alert("mod_charge", /obj/screen/alert/emptycell) + mod.wearer.throw_alert("mod_charge", /atom/movable/screen/alert/emptycell) /obj/item/mod/core/plasma/on_attackby(obj/item/attacking_item, mob/user, params) charge_plasma(attacking_item, user) diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index d4057244a450..14c1ce98eb89 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -101,7 +101,8 @@ ), ) -/datum/mod_theme/standard //We don't want the civilian skin to apply to all modsuits, that causes issues. +/// We don't want the civilian skin to apply to all modsuits, that causes issues. +/datum/mod_theme/standard name = "standard" @@ -1125,7 +1126,8 @@ ), ) -/obj/item/mod/armor/mod_theme_responsory //This has no slowdown active, and no variation between levels. I am ASSUMING this will be gamma only. +/// This has no slowdown active, and no variation between levels. I am ASSUMING this will be gamma only. +/obj/item/mod/armor/mod_theme_responsory armor = list(MELEE = 40, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 25, RAD = INFINITY, FIRE = 200, ACID = 200) /datum/mod_theme/apocryphal @@ -1335,5 +1337,6 @@ ), ) -/obj/item/mod/armor/mod_theme_administrative //considering this should not be used, it's getting just DS armor, not infinity in everything. +/// considering this should not be used, it's getting just DS armor, not infinity in everything. +/obj/item/mod/armor/mod_theme_administrative armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 0ae05ec490e6..370a5b29bcea 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -119,7 +119,8 @@ /obj/item/mod/module/sphere_transform, ) -/obj/item/mod/control/pre_equipped/mining/vendor //visit robotics. +/// visit robotics. +/obj/item/mod/control/pre_equipped/mining/vendor theme = /datum/mod_theme/mining applied_core = /obj/item/mod/core/plasma applied_modules = list( @@ -130,7 +131,8 @@ ) -/obj/item/mod/control/pre_equipped/mining/asteroid //The asteroid skin, as that one looks more space worthy / older. Good for space ruins. +/// The asteroid skin, as that one looks more space worthy / older. Good for space ruins. +/obj/item/mod/control/pre_equipped/mining/asteroid applied_skin = "asteroid" /obj/item/mod/control/pre_equipped/medical @@ -368,7 +370,8 @@ insignia_type = /obj/item/mod/module/insignia/chaplain additional_module = /obj/item/mod/module/injector -/obj/item/mod/control/pre_equipped/responsory/inquisitory //Diffrent look, as well as magic proof on TG. We don't have the magic proof stuff here, but it's perfect for inqusitors. Or if you want to give your ERT a fancy look. +/// Diffrent look, as well as magic proof on TG. We don't have the magic proof stuff here, but it's perfect for inqusitors. Or if you want to give your ERT a fancy look. +/obj/item/mod/control/pre_equipped/responsory/inquisitory applied_skin = "inquisitory" /obj/item/mod/control/pre_equipped/responsory/inquisitory/commander diff --git a/code/modules/mod/modules/_modules.dm b/code/modules/mod/modules/_modules.dm index fc7905d699b1..35f6b60db828 100644 --- a/code/modules/mod/modules/_modules.dm +++ b/code/modules/mod/modules/_modules.dm @@ -328,7 +328,7 @@ if(length(pinned_to)) for(var/datum/action/item_action/mod/pinned_module/M in user.actions) if(M.module == src) - M.Remove(user) + qdel(M) pinned_to = list() return var/datum/action/item_action/mod/pinned_module/new_action = new(Target = mod, custom_icon = src.icon, custom_icon_state = src.icon_state, linked_module = src, user = user) diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index 99fea77d8b82..dcacecc17377 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -30,7 +30,7 @@ /// Overlay we add to each grabbed atom. var/image/kinesis_icon /// Our mouse movement catcher. - var/obj/screen/fullscreen/cursor_catcher/kinesis/kinesis_catcher + var/atom/movable/screen/fullscreen/cursor_catcher/kinesis/kinesis_catcher /// The sounds playing while we grabbed an object. var/datum/looping_sound/kinesis/soundloop ///The pixel_X of whatever we were grabbing before hand. @@ -83,7 +83,7 @@ pre_pixel_x = grabbed_atom.pixel_x pre_pixel_y = grabbed_atom.pixel_y beam.chain = beam.Beam(grabbed_atom, icon_state = "kinesis", icon='icons/effects/beam.dmi', time = 100 SECONDS, maxdistance = 15, beam_type = /obj/effect/ebeam, beam_sleep_time = 3) - kinesis_catcher = mod.wearer.overlay_fullscreen("kinesis", /obj/screen/fullscreen/cursor_catcher/kinesis, 0) + kinesis_catcher = mod.wearer.overlay_fullscreen("kinesis", /atom/movable/screen/fullscreen/cursor_catcher/kinesis, 0) kinesis_catcher.assign_to_mob(mod.wearer) soundloop.start() START_PROCESSING(SSfastprocess, src) @@ -249,7 +249,7 @@ complexity = 0 use_power_cost = DEFAULT_CHARGE_DRAIN * 5 -/obj/screen/fullscreen/cursor_catcher/kinesis +/atom/movable/screen/fullscreen/cursor_catcher/kinesis icon = 'icons/mob/screen_kinesis.dmi' icon_state = "kinesis" diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm index 6e5a95364955..865cf356faa8 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -92,7 +92,8 @@ M.Copy_Parent(thrower, 15 SECONDS) qdel(src) -/mob/living/simple_animal/hostile/illusion/mirage //It's just standing there, menacingly +/// It's just standing there, menacingly +/mob/living/simple_animal/hostile/illusion/mirage AIStatus = AI_OFF density = FALSE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 630d3140b111..f0ed2903029c 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -32,7 +32,8 @@ name = "autopsy reports drawer" desc = "A large drawer for holding autopsy reports." -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/// not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete +/obj/structure/filingcabinet/filingcabinet icon_state = "tallcabinet" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 7f5a434af85e..c7339cb1585f 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -39,7 +39,7 @@ M.unEquip(src) M.put_in_hands(src) - else if(istype(over_object, /obj/screen)) + else if(is_screen_atom(over_object)) switch(over_object.name) if("r_hand") if(!remove_item_from_storage(M)) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 9ce82fb89937..da507d360a48 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -127,10 +127,11 @@ contained += "[round(reagent.volume, 0.01)]u [reagent]" if(reagents.total_volume && M.reagents) + var/fraction = min(transfer_amount / reagents.total_volume, 1) + reagents.reaction(M, REAGENT_INGEST, fraction) transfered = reagents.trans_to(M, transfer_amount) to_chat(user, "You sneakily stab [M] with the pen.") add_attack_logs(user, M, "Stabbed with (sleepy) [src]. [transfered]u of reagents transfered from pen containing [english_list(contained)].") - reagents.reaction(M, REAGENT_INGEST, 0.1) return TRUE diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 1885adb49ac3..6e89173910e4 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -142,7 +142,7 @@ if(ishuman(usr)) var/mob/M = usr - if(!istype(over_object, /obj/screen)) + if(!is_screen_atom(over_object)) return ..() playsound(loc, "rustle", 50, 1, -5) if((!M.restrained() && !M.stat && M.back == src)) diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 5539477190a4..aba7263615ed 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -10,13 +10,16 @@ var/photos_taken = 0 var/list/aipictures = list() -/obj/item/camera/siliconcam/ai_camera //camera AI can take pictures with +/// camera AI can take pictures with +/obj/item/camera/siliconcam/ai_camera name = "AI photo camera" -/obj/item/camera/siliconcam/robot_camera //camera cyborgs can take pictures with +/// camera cyborgs can take pictures with +/obj/item/camera/siliconcam/robot_camera name = "Cyborg photo camera" -/obj/item/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used +/// currently doesn't offer the verbs, thus cannot be used +/obj/item/camera/siliconcam/drone_camera name = "Drone photo camera" /obj/item/camera/siliconcam/proc/injectaialbum(datum/picture/P, sufix = "") //stores image information to a list similar to that of the datacore diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 8fb3082e0781..bb1c9ef9e2a0 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -1,5 +1,5 @@ /obj/item/stamp - name = "\improper rubber stamp" + name = "rubber stamp" desc = "A rubber stamp for stamping important documents." icon = 'icons/obj/bureaucracy.dmi' icon_state = "stamp-ok" diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index aaa3c6aeabdb..38022d19e7b7 100644 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(PDAs) /obj/item/pda/MouseDrop(obj/over_object as obj, src_location, over_location) var/mob/M = usr - if((!istype(over_object, /obj/screen)) && can_use()) + if((!is_screen_atom(over_object)) && can_use()) return attack_self(M) /obj/item/pda/attack_self(mob/user as mob) diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm index 9ca068dd81f5..4a66081f9563 100644 --- a/code/modules/pda/cart.dm +++ b/code/modules/pda/cart.dm @@ -282,7 +282,8 @@ charges = 4 messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) -/obj/item/cartridge/syndicate/nuclear //needed subtype so regular traitors can't open and close nuclear shuttle doors +/// needed subtype so regular traitors can't open and close nuclear shuttle doors +/obj/item/cartridge/syndicate/nuclear name = "Nuclear Agent Detomatix Cartridge" desc = "The same reliable Detomatix program except with the added ability of remotely toggling your nuclear shuttle airlock from your PDA" var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm index 5779b0944f10..c52d71f48869 100644 --- a/code/modules/pda/cart_apps.dm +++ b/code/modules/pda/cart_apps.dm @@ -449,8 +449,19 @@ var/direction = get_dir(pda,B) CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume) + var/list/JaniCartData = list() + for(var/obj/vehicle/janicart/janicart in GLOB.janitorial_equipment) + var/turf/janicart_loc = get_turf(janicart ) + if(janicart_loc) + if(janicart_loc.z != cl.z) + continue + var/direction_from_user = get_dir(pda, janicart) + JaniCartData[++JaniCartData.len] = list("x" = janicart_loc.x, "y" = janicart_loc.y, "direction_from_user" = uppertext(dir2text(direction_from_user))) + JaniData["mops"] = MopData.len ? MopData : null JaniData["buckets"] = BucketData.len ? BucketData : null JaniData["cleanbots"] = CbotData.len ? CbotData : null JaniData["carts"] = CartData.len ? CartData : null + JaniData["janicarts"] = JaniCartData.len ? JaniCartData : null data["janitor"] = JaniData + diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm index bd6ed8a952e9..f5ca2d8097a5 100644 --- a/code/modules/power/apc/apc.dm +++ b/code/modules/power/apc/apc.dm @@ -1063,7 +1063,8 @@ /obj/machinery/power/apc/off_station/empty_charge start_charge = 0 -/obj/machinery/power/apc/syndicate //general syndicate access +/// general syndicate access +/obj/machinery/power/apc/syndicate name = "Main branch, do not use" req_access = list(ACCESS_SYNDICATE) report_power_alarm = FALSE diff --git a/code/modules/power/apc/apc_malfunction.dm b/code/modules/power/apc/apc_malfunction.dm index 1494cef300e1..6f46ae9745c1 100644 --- a/code/modules/power/apc/apc_malfunction.dm +++ b/code/modules/power/apc/apc_malfunction.dm @@ -18,8 +18,8 @@ to_chat(malf, "Beginning override of APC systems. This takes some time, and you can only hack one APC at a time.") malf.malfhack = src malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai, malfhacked), src), 600, TIMER_STOPPABLE) - var/obj/screen/alert/hackingapc/A - A = malf.throw_alert("hackingapc", /obj/screen/alert/hackingapc) + var/atom/movable/screen/alert/hackingapc/A + A = malf.throw_alert("hackingapc", /atom/movable/screen/alert/hackingapc) A.target = src /obj/machinery/power/apc/proc/malfoccupy(mob/living/silicon/ai/malf) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 58ef4172770b..ac615cfcf740 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -211,17 +211,20 @@ name = "\improper X-01 multiphase energy gun power cell" maxcharge = 1200 -/obj/item/stock_parts/cell/pulse //200 pulse shots +/// 200 pulse shots +/obj/item/stock_parts/cell/pulse name = "pulse rifle power cell" maxcharge = 40000 rating = 3 chargerate = 1500 -/obj/item/stock_parts/cell/pulse/carbine //25 pulse shots +/// 25 pulse shots +/obj/item/stock_parts/cell/pulse/carbine name = "pulse carbine power cell" maxcharge = 5000 -/obj/item/stock_parts/cell/pulse/pistol //10 pulse shots +/// 10 pulse shots +/obj/item/stock_parts/cell/pulse/pistol name = "pulse pistol power cell" maxcharge = 2000 @@ -371,7 +374,8 @@ maxcharge = 40000 chargerate = 2600 // about 30 seconds to charge with a default recharger -/obj/item/stock_parts/cell/emproof/reactive // EMP proof so emp_act does not double dip. +/// EMP proof so emp_act does not double dip. +/obj/item/stock_parts/cell/emproof/reactive name = "reactive armor power cell" desc = "A cell used to power reactive armors." maxcharge = 2400 diff --git a/code/modules/power/engines/singularity/collector.dm b/code/modules/power/engines/singularity/collector.dm index ccacc3d2fb8c..5e16aa265b83 100644 --- a/code/modules/power/engines/singularity/collector.dm +++ b/code/modules/power/engines/singularity/collector.dm @@ -5,7 +5,7 @@ #define RAD_COLLECTOR_OUTPUT min(stored_energy, (stored_energy * RAD_COLLECTOR_STORED_OUT) + 1000) //Produces at least 1000 watts if it has more than that stored /obj/machinery/power/rad_collector - name = "\improper radiation collector array" + name = "radiation collector array" desc = "A device which uses Hawking Radiation and plasma to produce power." icon = 'icons/obj/singularity.dmi' icon_state = "ca" diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm index a2424bad6651..47676b99e59d 100644 --- a/code/modules/power/engines/singularity/narsie.dm +++ b/code/modules/power/engines/singularity/narsie.dm @@ -1,4 +1,5 @@ -/obj/singularity/narsie //Moving narsie to a child object of the singularity so it can be made to function differently. --NEO +/// Moving narsie to a child object of the singularity so it can be made to function differently. --NEO +/obj/singularity/narsie name = "Nar'sie's Avatar" desc = "Your mind begins to bubble and ooze as it tries to comprehend what it sees." icon = 'icons/obj/magic_terror.dmi' diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm index 678b6c49dd10..08d0f4c351fd 100644 --- a/code/modules/power/engines/supermatter/supermatter.dm +++ b/code/modules/power/engines/supermatter/supermatter.dm @@ -1029,7 +1029,8 @@ moveable = FALSE anchored = TRUE -/obj/machinery/atmospherics/supermatter_crystal/shard/hugbox/fakecrystal //Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle +/// Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle +/obj/machinery/atmospherics/supermatter_crystal/shard/hugbox/fakecrystal name = "supermatter crystal" base_icon_state = "darkmatter" icon_state = "darkmatter" diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm index 620d88ca48a3..08031bcec240 100644 --- a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm +++ b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm @@ -25,7 +25,8 @@ // Generators -/datum/mapGenerator/syndicate/empty //walls and floor only +/// walls and floor only +/datum/mapGenerator/syndicate/empty modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \ /datum/mapGeneratorModule/border/syndieWalls,\ /datum/mapGeneratorModule/bottomLayer/repressurize) diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm index 322d210681af..93f8c9b3d661 100644 --- a/code/modules/projectiles/ammunition/energy_lens.dm +++ b/code/modules/projectiles/ammunition/energy_lens.dm @@ -13,7 +13,8 @@ muzzle_flash_color = LIGHT_COLOR_DARKRED select_name = "kill" -/obj/item/ammo_casing/energy/laser/cyborg //to balance cyborg energy cost seperately +/// to balance cyborg energy cost seperately +/obj/item/ammo_casing/energy/laser/cyborg e_cost = 250 /obj/item/ammo_casing/energy/lasergun @@ -175,7 +176,8 @@ randomspread = 1 delay = 2 -/obj/item/ammo_casing/energy/disabler/cyborg //seperate balancing for cyborg, again +/// seperate balancing for cyborg, again +/obj/item/ammo_casing/energy/disabler/cyborg e_cost = 250 /obj/item/ammo_casing/energy/disabler/hos @@ -306,7 +308,8 @@ e_cost = 350 // about 42 shots on an engineering borg from a borging machine, Reads a lot better than it actually is because people miss shots and often your better abilities require charge as well delay = 1 SECONDS -/obj/item/ammo_casing/energy/emitter/cyborg/proto // needed a slightly weaker ranged option to give to Safety Overriden borgs. The fire rate is about the same as an emitter if you put it on the ground. +/// needed a slightly weaker ranged option to give to Safety Overriden borgs. The fire rate is about the same as an emitter if you put it on the ground. +/obj/item/ammo_casing/energy/emitter/cyborg/proto e_cost = 500 delay = 2 SECONDS diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 54fc6475c145..2a74c71b4482 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -571,7 +571,8 @@ multi_sprite_step = 5 w_class = WEIGHT_CLASS_NORMAL -/obj/item/ammo_box/magazine/laser/ert //Used by red ERT. Keeps the size for them +/// Used by red ERT. Keeps the size for them +/obj/item/ammo_box/magazine/laser/ert name = "compact laser carbine projector magazine" desc = "By use of bluespace technology, the ammo casings are stored in a pocket dimension, saving on space and making them EMP proof." w_class = WEIGHT_CLASS_TINY @@ -589,7 +590,8 @@ /obj/item/ammo_box/magazine/toy/smgm45/riot ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot -/obj/item/ammo_box/magazine/detective/speedcharger //yes this doesn't really belong here but nowhere else works +// yes this doesn't really belong here but nowhere else works +/obj/item/ammo_box/magazine/detective/speedcharger name = "DL-88 charge pack" desc = "One-use charge pack for the DL-88 energy revolver." icon_state = "handgun_ammo_battery" diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm index f76483b01c4f..bad7b5dcbfc4 100644 --- a/code/modules/projectiles/guns/energy/special_eguns.dm +++ b/code/modules/projectiles/guns/energy/special_eguns.dm @@ -838,7 +838,8 @@ tracking_target_UID = null -/obj/item/gun/energy/spikethrower //It's like the cyborg LMG, uses energy to make spikes +/// It's like the cyborg LMG, uses energy to make spikes +/obj/item/gun/energy/spikethrower name = "\improper Vox spike thrower" desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive." icon = 'icons/obj/guns/projectile.dmi' diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 381d1d641d9e..4168361a0e2c 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -112,8 +112,9 @@ user.bleed(BLOOD_VOLUME_NORMAL) user.death() // Just in case -/obj/item/gun/projectile/revolver/fingergun //Summoned by the Finger Gun spell, from advanced mimery traitor item - name = "\improper finger gun" +/// Summoned by the Finger Gun spell, from advanced mimery traitor item +/obj/item/gun/projectile/revolver/fingergun + name = "finger gun" desc = "Bang bang bang!" icon_state = "fingergun" force = 0 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 70e9a7f903be..f5f3d6100d37 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -86,7 +86,8 @@ // RIOT SHOTGUN // -/obj/item/gun/projectile/shotgun/riot //for spawn in the armory +/// for spawn in the armory +/obj/item/gun/projectile/shotgun/riot name = "riot shotgun" desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control." icon_state = "riotshotgun" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 56935aae546e..406aa34e3e3b 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -7,7 +7,8 @@ hitsound_wall = "ricochet" impact_effect_type = /obj/effect/temp_visual/impact_effect -/obj/item/projectile/bullet/weakbullet //beanbag, heavy stamina damage +/// beanbag, heavy stamina damage +/obj/item/projectile/bullet/weakbullet name = "beanbag slug" damage = 5 stamina = 40 @@ -138,7 +139,8 @@ /obj/item/projectile/bullet/heavybullet damage = 35 -/obj/item/projectile/bullet/stunshot //taser slugs for shotguns, nothing special +/// taser slugs for shotguns, nothing special +/obj/item/projectile/bullet/stunshot name = "stunshot" damage = 5 weaken = 10 SECONDS diff --git a/code/modules/reagents/chemistry/reagents/admin_reagents.dm b/code/modules/reagents/chemistry/reagents/admin_reagents.dm index 32dc34f79de3..bce28f02500e 100644 --- a/code/modules/reagents/chemistry/reagents/admin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/admin_reagents.dm @@ -1,4 +1,5 @@ -/datum/reagent/medicine/adminordrazine //An OP chemical for admins +/// An OP chemical for admins +/datum/reagent/medicine/adminordrazine name = "Adminordrazine" id = "adminordrazine" description = "It's magic. We don't have to explain it." diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index ac51cdc9cadc..2995b332c32d 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -230,7 +230,8 @@ drink_desc = "Damn, you feel like some kind of French aristocrat just by holding this." taste_description = "cognac" -/datum/reagent/consumable/ethanol/suicider //otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning". +/// otherwise known as "I want to get so smashed my liver gives out and I die from alcohol poisoning". +/datum/reagent/consumable/ethanol/suicider name = "Suicider" id = "suicider" description = "An unbelievably strong and potent variety of Cider." @@ -1155,7 +1156,8 @@ drink_desc = "For enjoying the most wonderful time of the year." taste_description = "christmas spirit" -/datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans +/// inaccessible to players, but here for admin shennanigans +/datum/reagent/consumable/ethanol/dragons_breath name = "Dragon's Breath" id = "dragonsbreath" description = "Possessing this stuff probably breaks the Geneva convention." @@ -1409,7 +1411,8 @@ #undef MIN_WINE_PERCENT -/datum/reagent/consumable/ethanol/bacchus_blessing //An EXTREMELY powerful drink. Smashed in seconds, dead in minutes. +/// An EXTREMELY powerful drink. Smashed in seconds, dead in minutes. +/datum/reagent/consumable/ethanol/bacchus_blessing name = "Bacchus' Blessing" id = "bacchus_blessing" description = "Unidentifiable mixture. Unmeasurably high alcohol content." diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 0387905fe2c7..5eaa1a1e094b 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -12,7 +12,8 @@ /datum/reagent/blob/proc/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag) //when the blob takes damage, do this return damage -/datum/reagent/blob/ripping_tendrils //does brute and a little stamina damage +/// does brute and a little stamina damage +/datum/reagent/blob/ripping_tendrils name = "Ripping Tendrils" description = "Deals High Brute damage, as well as Stamina damage." id = "ripping_tendrils" @@ -28,7 +29,8 @@ if(iscarbon(M)) M.emote("scream") -/datum/reagent/blob/boiling_oil //sets you on fire, does burn damage +/// sets you on fire, does burn damage +/datum/reagent/blob/boiling_oil name = "Boiling Oil" description = "Deals High Burn damage, and sets the victim aflame." id = "boiling_oil" @@ -45,7 +47,8 @@ M.IgniteMob() M.emote("scream") -/datum/reagent/blob/envenomed_filaments //toxin, hallucination, and some bonus spore toxin +/// toxin, hallucination, and some bonus spore toxin +/datum/reagent/blob/envenomed_filaments name = "Envenomed Filaments" description = "Deals High Toxin damage, causes Hallucinations, and injects Spores into the bloodstream." id = "envenomed_filaments" @@ -61,7 +64,8 @@ if(M.reagents) M.reagents.add_reagent("spore", 0.4*volume) -/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute +/// does tons of oxygen damage and a little brute +/datum/reagent/blob/lexorin_jelly name = "Lexorin Jelly" description = "Deals Medium Brute damage, but massive amounts of Respiration Damage." id = "lexorin_jelly" @@ -77,7 +81,8 @@ M.AdjustLoseBreath(round(0.6 SECONDS * volume)) -/datum/reagent/blob/kinetic //does semi-random brute damage +/// does semi-random brute damage +/datum/reagent/blob/kinetic name = "Kinetic Gelatin" description = "Deals Randomized damage, between 0.33 to 2.33 times the standard amount." id = "kinetic" @@ -91,7 +96,8 @@ var/damage = rand(5, 35)/25 M.apply_damage(damage*volume, BRUTE) -/datum/reagent/blob/cryogenic_liquid //does low burn damage and stamina damage and cools targets down +/// does low burn damage and stamina damage and cools targets down +/datum/reagent/blob/cryogenic_liquid name = "Cryogenic Liquid" description = "Deals Medium Brute damage, Stamina Damage, and injects Frost Oil into its victims, freezing them to death." id = "cryogenic_liquid" diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 51f8ec28f334..da1e5407c06c 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -775,7 +775,8 @@ M.emote("laugh") return list(effect, update_flags) -/datum/reagent/rotatium //Rotatium. Fucks up your rotation and is hilarious +/// Rotatium. Fucks up your rotation and is hilarious +/datum/reagent/rotatium name = "Rotatium" id = "rotatium" description = "A constantly swirling, oddly colourful fluid. Causes the consumer's sense of direction and hand-eye coordination to become wild." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 496cbf3fdd49..e1e666e56ab3 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -19,7 +19,8 @@ H.adjust_nutrition(nutriment_factor) // For hunger and fatness return ..() -/datum/reagent/consumable/nutriment // Pure nutriment, universally digestable and thus slightly less effective +/// Pure nutriment, universally digestable and thus slightly less effective +/datum/reagent/consumable/nutriment name = "Nutriment" id = "nutriment" description = "A questionable mixture of various pure nutrients commonly found in processed foods." @@ -62,13 +63,15 @@ counterlist_normalise(taste_amounts) data = taste_amounts -/datum/reagent/consumable/nutriment/protein // Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores +/// Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores +/datum/reagent/consumable/nutriment/protein name = "Protein" id = "protein" description = "Various essential proteins and fats commonly found in animal flesh and blood." diet_flags = DIET_CARN | DIET_OMNI -/datum/reagent/consumable/nutriment/plantmatter // Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores +/// Plant-based biomatter, digestable by herbivores and omnivores, worthless to carnivores +/datum/reagent/consumable/nutriment/plantmatter name = "Plant-matter" id = "plantmatter" description = "Vitamin-rich fibers and natural sugars commonly found in fresh produce." @@ -219,56 +222,36 @@ if(method == REAGENT_TOUCH) if(ishuman(M)) var/mob/living/carbon/human/victim = M - var/mouth_covered = 0 - var/eyes_covered = 0 + var/mouth_covered = FALSE + var/eyes_covered = FALSE var/obj/item/safe_thing = null if(victim.wear_mask) if(victim.wear_mask.flags_cover & MASKCOVERSEYES) - eyes_covered = 1 + eyes_covered = TRUE safe_thing = victim.wear_mask if(victim.wear_mask.flags_cover & MASKCOVERSMOUTH) - mouth_covered = 1 + mouth_covered = TRUE safe_thing = victim.wear_mask if(victim.head) if(victim.head.flags_cover & MASKCOVERSEYES) - eyes_covered = 1 + eyes_covered = TRUE safe_thing = victim.head if(victim.head.flags_cover & MASKCOVERSMOUTH) - mouth_covered = 1 + mouth_covered = TRUE safe_thing = victim.head - if(victim.glasses) - eyes_covered = 1 - if(!safe_thing) - safe_thing = victim.glasses + if(eyes_covered && mouth_covered) to_chat(victim, "Your [safe_thing] protects you from the pepperspray!") return - else if(mouth_covered) // Reduced effects if partially protected - to_chat(victim, "Your [safe_thing] protect you from most of the pepperspray!") - if(prob(5)) - victim.emote("scream") - victim.EyeBlurry(6 SECONDS) - victim.EyeBlind(2 SECONDS) - victim.Confused(6 SECONDS) - victim.damageoverlaytemp = 60 - victim.Weaken(6 SECONDS) - victim.drop_item() - return - else if(eyes_covered) // Eye cover is better than mouth cover - to_chat(victim, "Your [safe_thing] protects your eyes from the pepperspray!") - victim.EyeBlurry(6 SECONDS) - victim.damageoverlaytemp = 30 - return - else // Oh dear :D - if(prob(5)) - victim.emote("scream") - to_chat(victim, "You're sprayed directly in the eyes with pepperspray!") - victim.EyeBlurry(10 SECONDS) - victim.EyeBlind(4 SECONDS) - victim.Confused(12 SECONDS) - victim.damageoverlaytemp = 75 - victim.Weaken(10 SECONDS) - victim.drop_item() + + if(!mouth_covered) + victim.apply_status_effect(STATUS_EFFECT_PEPPERSPRAYED) + + if(!eyes_covered) + to_chat(victim, "Your eyes burns!") + victim.Stun(0.5 SECONDS) + victim.EyeBlurry(20 SECONDS) + victim.EyeBlind(8 SECONDS) /datum/reagent/consumable/frostoil name = "Frost Oil" @@ -833,7 +816,8 @@ ///Food Related, but non-nutritious -/datum/reagent/questionmark // food poisoning +/// food poisoning +/datum/reagent/questionmark name = "????" id = "????" description = "A gross and unidentifiable substance." diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 3cd551e24f94..7057b02f99ba 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -1258,7 +1258,8 @@ M.Drowsy(40 SECONDS) return ..() | update_flags -/datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs +/// Used exclusively by Syndicate medical cyborgs +/datum/reagent/medicine/syndicate_nanites name = "Restorative Nanites" id = "syndicate_nanites" description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts." @@ -1400,7 +1401,8 @@ return ..() | update_flags -/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants +/// Created by ambrosia gaia plants +/datum/reagent/medicine/earthsblood name = "Earthsblood" id = "earthsblood" description = "Ichor from an extremely powerful plant. Great for restoring wounds, but it's a little heavy on the brain." diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm index e99879f3b28d..ad585ba96a17 100644 --- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm @@ -447,7 +447,8 @@ /datum/reagent/love/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) to_chat(M, "You feel loved!") -/datum/reagent/jestosterone //Formerly known as Nitrogen tungstide hypochlorite before NT fired the chemists for trying to be funny +/// Formerly known as Nitrogen tungstide hypochlorite before NT fired the chemists for trying to be funny +/datum/reagent/jestosterone name = "Jestosterone" id = "jestosterone" description = "Jestosterone is an odd chemical compound that induces a variety of annoying side-effects in the average person. It also causes mild intoxication, and is toxic to mimes." diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm index c104e21bd9e9..264b0b6c8823 100644 --- a/code/modules/reagents/chemistry/reagents/toxins.dm +++ b/code/modules/reagents/chemistry/reagents/toxins.dm @@ -452,7 +452,8 @@ M.EyeBlurry(6 SECONDS) return ..() | update_flags -/datum/reagent/beer2 //disguised as normal beer for use by emagged service borgs +/// disguised as normal beer for use by emagged service borgs +/datum/reagent/beer2 name = "Beer" id = "beer2" description = "An alcoholic beverage made from malted grains, hops, yeast, and water." @@ -1082,7 +1083,8 @@ lethality = 2 //Atrazine, however, is definitely toxic -/datum/reagent/pestkiller // To-Do; make this more realistic. +/// To-Do; make this more realistic. +/datum/reagent/pestkiller name = "Pest Killer" id = "pestkiller" description = "A harmful toxic mixture to kill pests. Do not ingest!" @@ -1237,7 +1239,8 @@ M.emote("scream") M.adjustBruteLoss(4) -/datum/reagent/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective. +/// Teslium. Causes periodic shocks, and makes shocks against the target much more effective. +/datum/reagent/teslium name = "Teslium" id = "teslium" description = "An unstable, electrically-charged metallic slurry. Increases the conductance of living things." @@ -1281,7 +1284,8 @@ playsound(M, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) chosen_timer = rand(shock_low, shock_high) //It needs to be randomised here for blob teslium, and randoming it here doesn't affect normal -/datum/reagent/teslium/blob //This version has it's shocks much less frequently, while retaining the shock multiplier +/// This version has it's shocks much less frequently, while retaining the shock multiplier +/datum/reagent/teslium/blob id = "blob_teslium" shock_low = 10 use_chaotic_random = FALSE diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm index 4c894c64f671..451cc4fa829e 100644 --- a/code/modules/reagents/chemistry/reagents/water.dm +++ b/code/modules/reagents/chemistry/reagents/water.dm @@ -118,7 +118,7 @@ if(method == REAGENT_INGEST && iscarbon(M)) var/mob/living/carbon/C = M - if(C.mind?.has_antag_datum(/datum/antagonist/vampire)) + if(C.mind?.has_antag_datum(/datum/antagonist/vampire) && data["blood_type"] != BLOOD_TYPE_FAKE_BLOOD) C.set_nutrition(min(NUTRITION_LEVEL_WELL_FED, C.nutrition + 10)) C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL) ..() @@ -363,7 +363,8 @@ qdel(R) T.Bless() -/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/// if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/datum/reagent/fuel/unholywater name = "Unholy Water" id = "unholywater" description = "Something that shouldn't exist on this plane of existence." diff --git a/code/modules/reagents/chemistry/reagents_datum.dm b/code/modules/reagents/chemistry/reagents_datum.dm index 6f2f09a42e5a..fa5aa62e8842 100644 --- a/code/modules/reagents/chemistry/reagents_datum.dm +++ b/code/modules/reagents/chemistry/reagents_datum.dm @@ -78,7 +78,8 @@ if(id == "blood" && !(data?["blood_type"] in get_safe_blood(C.dna?.blood_type)) || C.dna?.species.name != data?["species"] && (data?["species_only"] || C.dna?.species.own_species_blood)) C.reagents.add_reagent("toxin", volume * 0.5) else - C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL) + if(data?["blood_type"] != BLOOD_TYPE_FAKE_BLOOD) + C.blood_volume = min(C.blood_volume + round(volume, 0.1), BLOOD_VOLUME_NORMAL) // This does not absorb the blood we are getting in *this* reagent transfer operation, // (because the actual transfer has not happened yet. Because reasons) but it does process // the blood already in the mob. diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index ed5bb95bedd7..0614786d2d1b 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -225,7 +225,8 @@ result_amount = 2 mix_message = "The substance becomes a pile of burning dust." -/datum/chemical_reaction/phlogiston_fire //This MUST be above the smoke recipe. +/// This MUST be above the smoke recipe. +/datum/chemical_reaction/phlogiston_fire name = "Phlogiston Fire" id = "phlogiston_fire" result = "phlogiston" diff --git a/code/modules/reagents/chemistry/recipes/toxins_reactions.dm b/code/modules/reagents/chemistry/recipes/toxins_reactions.dm index cf61f2f916b0..68d23fe73c10 100644 --- a/code/modules/reagents/chemistry/recipes/toxins_reactions.dm +++ b/code/modules/reagents/chemistry/recipes/toxins_reactions.dm @@ -108,7 +108,8 @@ result_amount = 3 mix_message = "The mixture gives off a harsh odor" -/datum/chemical_reaction/pestkiller // To-Do make this more realistic +/// To-Do make this more realistic +/datum/chemical_reaction/pestkiller name = "Pest Killer" id = "pestkiller" result = "pestkiller" diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 44bb7655de24..7a70db39f578 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -39,7 +39,7 @@ create_reagents(volume, temperature_min, temperature_max) if(spawned_disease) var/datum/disease/F = new spawned_disease(0) - var/list/data = list("viruses" = list(F), "blood_color" = "#A10808") + var/list/data = list("viruses" = list(F), "blood_color" = "#A10808", "blood_type" = BLOOD_TYPE_FAKE_BLOOD) reagents.add_reagent("blood", disease_amount, data) add_initial_reagents() diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm index 57bc2d39221a..7b29dfdcee32 100644 --- a/code/modules/reagents/reagent_containers/applicator.dm +++ b/code/modules/reagents/reagent_containers/applicator.dm @@ -144,5 +144,6 @@ name = "dual auto-mender" list_reagents = list("synthflesh" = 200) -/obj/item/reagent_containers/applicator/dual/syndi // It magically goes through hardsuits. Don't ask how. +/// It magically goes through hardsuits. Don't ask how. +/obj/item/reagent_containers/applicator/dual/syndi ignore_flags = TRUE diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index ccffe1dcab95..558f06a3a195 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -116,7 +116,8 @@ volume = 100 list_reagents = list("nanites" = 100) -/obj/item/reagent_containers/hypospray/autoinjector // This is an empty variant +/// This is an empty variant +/obj/item/reagent_containers/hypospray/autoinjector name = "empty autoinjector" desc = "A rapid and safe way to inject chemicals into humanoids. This one is empty." icon_state = "autoinjector" @@ -160,13 +161,15 @@ desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." list_reagents = list("epinephrine" = 10) -/obj/item/reagent_containers/hypospray/autoinjector/teporone //basilisks +/// basilisks +/obj/item/reagent_containers/hypospray/autoinjector/teporone name = "teporone autoinjector" desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction." icon_state = "lepopen" list_reagents = list("teporone" = 10) -/obj/item/reagent_containers/hypospray/autoinjector/stimpack //goliath kiting +/// goliath kiting +/obj/item/reagent_containers/hypospray/autoinjector/stimpack name = "stimpack autoinjector" desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor." icon_state = "stimpen" diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index 0236eb5ed2eb..4dcf8ffff9a4 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -163,7 +163,8 @@ . = ..() name = "[initial(name)] - Saline Glucose" -/obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation. +/// Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation. +/obj/item/reagent_containers/iv_bag/blood var/blood_type var/blood_species = "Synthetic humanoid" var/iv_blood_colour = "#A10808" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 518e1f9a4a42..6a7f760a61e0 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -273,8 +273,9 @@ to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.") -// Plant-B-Gone -/obj/item/reagent_containers/spray/plantbgone // -- Skie +/// Plant-B-Gone +/// -- Skie +/obj/item/reagent_containers/spray/plantbgone name = "Plant-B-Gone" desc = "Kills those pesky weeds!" icon = 'icons/obj/hydroponics/equipment.dmi' diff --git a/code/modules/recycling/belt-placer.dm b/code/modules/recycling/belt-placer.dm index 1b473bef8146..8e1db8b15fce 100644 --- a/code/modules/recycling/belt-placer.dm +++ b/code/modules/recycling/belt-placer.dm @@ -1,4 +1,5 @@ -/obj/item/storage/conveyor //Stores conveyor belts, click floor to make belt, use a conveyor switch on this to link all belts to that lever. +/// Stores conveyor belts, click floor to make belt, use a conveyor switch on this to link all belts to that lever. +/obj/item/storage/conveyor name = "conveyor belt placer" desc = "This device facilitates the rapid deployment of conveyor belts." icon_state = "belt_placer" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 50bc20252eb8..dd15c3f2a650 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -547,7 +547,7 @@ /obj/machinery/disposal/get_remote_view_fullscreens(mob/user) if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS))) - user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 2) + user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 2) /obj/machinery/disposal/force_eject_occupant(mob/target) target.forceMove(get_turf(src)) diff --git a/code/modules/research/anomaly/anomaly.dm b/code/modules/research/anomaly/anomaly.dm index e3d80b984edf..b895540988ea 100644 --- a/code/modules/research/anomaly/anomaly.dm +++ b/code/modules/research/anomaly/anomaly.dm @@ -18,42 +18,42 @@ //Anomaly cores /obj/item/assembly/signaler/anomaly/pyro - name = "\improper pyroclastic anomaly core" + name = "pyroclastic anomaly core" desc = "The neutralized core of a pyroclastic anomaly. It feels warm to the touch. It'd probably be valuable for research." icon_state = "pyro_core" anomaly_type = /obj/effect/anomaly/pyro origin_tech = "plasmatech=7" /obj/item/assembly/signaler/anomaly/cryo - name = "\improper cryogenic anomaly core" + name = "cryogenic anomaly core" desc = "The neutralized core of a cryogenic anomaly. Rime is forming on its cold surface. It'd probably be valuable for research." icon_state = "cryo_core" anomaly_type = /obj/effect/anomaly/cryo origin_tech = "biotech=7" /obj/item/assembly/signaler/anomaly/grav - name = "\improper gravitational anomaly core" + name = "gravitational anomaly core" desc = "The neutralized core of a gravitational anomaly. It feels much heavier than it looks. It'd probably be valuable for research." icon_state = "grav_core" anomaly_type = /obj/effect/anomaly/grav origin_tech = "magnets=7" /obj/item/assembly/signaler/anomaly/flux - name = "\improper flux anomaly core" + name = "flux anomaly core" desc = "The neutralized core of a flux anomaly. Touching it makes your skin tingle. It'd probably be valuable for research." icon_state = "flux_core" anomaly_type = /obj/effect/anomaly/flux origin_tech = "powerstorage=7" /obj/item/assembly/signaler/anomaly/bluespace - name = "\improper bluespace anomaly core" + name = "bluespace anomaly core" desc = "The neutralized core of a bluespace anomaly. It keeps phasing in and out of view. It'd probably be valuable for research." icon_state = "anomaly_core" anomaly_type = /obj/effect/anomaly/bluespace origin_tech = "bluespace=7" /obj/item/assembly/signaler/anomaly/vortex - name = "\improper vortex anomaly core" + name = "vortex anomaly core" desc = "The neutralized core of a vortex anomaly. It won't sit still, as if some invisible force is acting on it. It'd probably be valuable for research." icon_state = "vortex_core" anomaly_type = /obj/effect/anomaly/bhole diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 809cf610e017..aeae9e6daa5a 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -29,7 +29,8 @@ other types of metals and chemistry for reagents). */ -/datum/design //Datum for object designs, used in construction +/// Datum for object designs, used in construction +/datum/design var/name = "Name" //Name of the created object. var/desc = "Desc" //Description of the created object. var/id = "id" //ID of the created object for easy refernece. Alphanumeric, lower-case, no symbols diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm index 50e22ec33cae..184682337239 100644 --- a/code/modules/research/research.dm +++ b/code/modules/research/research.dm @@ -44,7 +44,8 @@ research holder datum. ** Includes all the helper procs and basic tech processing. ** ***************************************************************/ -/datum/research //Holder for all the existing, archived, and known tech. Individual to console. +/// Holder for all the existing, archived, and known tech. Individual to console. +/datum/research //Datum/tech go here. // Possible is a list of direct datum references @@ -249,7 +250,8 @@ research holder datum. ** Includes all the various technoliges and what they make. ** ***************************************************************/ -/datum/tech //Datum of individual technologies. +/// Datum of individual technologies. +/datum/tech var/name = "name" //Name of the technology. var/desc = "description" //General description of what it does and what it makes. var/id = "id" //An easily referenced ID. Must be alphanumeric, lower-case, and no symbols. @@ -317,7 +319,8 @@ research holder datum. id = "programming" max_level = 7 -/datum/tech/toxins //not meant to be raised by deconstruction, do not give objects toxins as an origin_tech +/// not meant to be raised by deconstruction, do not give objects toxins as an origin_tech +/datum/tech/toxins name = "Toxins Research" desc = "Research into plasma based explosive devices. Upgrade through testing explosives in the toxins lab." id = "toxins" diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm index fa9306f52459..35c509798e12 100644 --- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm +++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm @@ -68,7 +68,8 @@ layer = TURF_LAYER plane = FLOOR_PLANE -/obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path... +/// this is used by BLOOD CULT, it shouldn't use such a path... +/obj/effect/clockwork/overlay/floor/bloodcult icon_state = "cult" // Wall gears @@ -204,7 +205,8 @@ name = "gear bit" desc = "A broken chunk of a gear. You want it." -/obj/item/clockwork/alloy_shards/medium/gear_bit/large //gives more power +/// gives more power +/obj/item/clockwork/alloy_shards/medium/gear_bit/large /obj/item/clockwork/alloy_shards/medium/gear_bit/large/replace_name_desc() ..() diff --git a/code/modules/ruins/lavalandruin_code/sin_ruins.dm b/code/modules/ruins/lavalandruin_code/sin_ruins.dm index 38fc3e466bdb..8d9ed669b8c8 100644 --- a/code/modules/ruins/lavalandruin_code/sin_ruins.dm +++ b/code/modules/ruins/lavalandruin_code/sin_ruins.dm @@ -130,7 +130,8 @@ collapse() // Gluttony -/obj/effect/gluttony //Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through. +/// Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through. +/obj/effect/gluttony name = "gluttony's wall" desc = "Only those who truly indulge may pass." anchored = TRUE @@ -153,7 +154,8 @@ return FALSE // Pride -/obj/structure/mirror/magic/pride //Pride's mirror: Used in the Pride ruin. +/// Pride's mirror: Used in the Pride ruin. +/obj/structure/mirror/magic/pride name = "pride's mirror" desc = "Pride cometh before the..." icon_state = "magic_mirror" @@ -180,7 +182,8 @@ C.drop(user) // Envy -/obj/item/kitchen/knife/envy //Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike. +/// Envy's knife: Found in the Envy ruin. Attackers take on the appearance of whoever they strike. +/obj/item/kitchen/knife/envy name = "envy's knife" desc = "Their success will be yours." icon = 'icons/obj/wizard.dmi' diff --git a/code/modules/space_management/space_transition.dm b/code/modules/space_management/space_transition.dm index 282fa666b996..f6030cfdf5d4 100644 --- a/code/modules/space_management/space_transition.dm +++ b/code/modules/space_management/space_transition.dm @@ -82,7 +82,8 @@ return S -/datum/point //this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else +/// this is explicitly utilitarian datum type made specially for the space map generation and are absolutely unusable for anything else +/datum/point var/list/neighbors = list() var/x var/y diff --git a/code/modules/supply/supply_packs/pack_emergency.dm b/code/modules/supply/supply_packs/pack_emergency.dm index 3957f94e9397..c34c949986bb 100644 --- a/code/modules/supply/supply_packs/pack_emergency.dm +++ b/code/modules/supply/supply_packs/pack_emergency.dm @@ -1,4 +1,5 @@ -/datum/supply_packs/emergency // Section header - use these to set default supply group and crate type for sections +/// Section header - use these to set default supply group and crate type for sections +/datum/supply_packs/emergency name = "HEADER" // Use "HEADER" to denote section headers, this is needed for the supply computers to filter them containertype = /obj/structure/closet/crate/internals group = SUPPLY_EMERGENCY diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm index cd06c41f7853..f75fbf64f1ea 100644 --- a/code/modules/supply/supply_packs/pack_engineering.dm +++ b/code/modules/supply/supply_packs/pack_engineering.dm @@ -12,7 +12,8 @@ containertype = /obj/structure/largecrate containername = "fuel tank crate" -/datum/supply_packs/engineering/tools //the most robust crate +/// the most robust crate +/datum/supply_packs/engineering/tools name = "Toolbox Crate" contains = list(/obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/electrical, diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm index 113ab3cbfa7c..80dfa802b469 100644 --- a/code/modules/supply/supply_packs/pack_miscellaneous.dm +++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm @@ -405,7 +405,8 @@ cost = 1000 containername = "expensive coat crate" -/datum/supply_packs/misc/formalwear //This is a very classy crate. +/// This is a very classy crate. +/datum/supply_packs/misc/formalwear name = "Formal Wear Crate" contains = list(/obj/item/clothing/under/dress/blacktango, /obj/item/clothing/under/misc/assistantformal, @@ -449,7 +450,8 @@ cost = 400 containername = "wedding crate" -/datum/supply_packs/misc/teamcolors //For team sports like space polo +/// For team sports like space polo +/datum/supply_packs/misc/teamcolors name = "Team Jerseys Crate" // 4 red jerseys, 4 blue jerseys, and 1 baseball contains = list(/obj/item/clothing/under/color/red/jersey, @@ -464,7 +466,8 @@ cost = 300 containername = "team jerseys crate" -/datum/supply_packs/misc/polo //For space polo! Or horsehead Quiditch +/// For space polo! Or horsehead Quiditch +/datum/supply_packs/misc/polo name = "Polo Supply Crate" // 6 brooms, 6 horse masks for the brooms, and 1 beach ball contains = list(/obj/item/staff/broom, @@ -483,7 +486,8 @@ cost = 250 containername = "polo supply crate" -/datum/supply_packs/misc/boxing //For non log spamming cargo brawls! +/// For non log spamming cargo brawls! +/datum/supply_packs/misc/boxing name = "Boxing Supply Crate" // 4 boxing gloves contains = list(/obj/item/clothing/gloves/boxing/blue, diff --git a/code/modules/supply/supply_packs/pack_organic.dm b/code/modules/supply/supply_packs/pack_organic.dm index 2f6158d207bf..26940ae35729 100644 --- a/code/modules/supply/supply_packs/pack_organic.dm +++ b/code/modules/supply/supply_packs/pack_organic.dm @@ -37,7 +37,8 @@ cost = 500 containername = "Pizza crate" -/datum/supply_packs/misc/randomised/ingredients // its a bit hacky... +/// its a bit hacky... +/datum/supply_packs/misc/randomised/ingredients num_contained = 25 contains = list(/obj/item/food/snacks/grown/wheat, /obj/item/food/snacks/grown/tomato, @@ -234,7 +235,8 @@ ////// hippy gear -/datum/supply_packs/organic/hydroponics // -- Skie +/// -- Skie +/datum/supply_packs/organic/hydroponics name = "Hydroponics Supply Crate" contains = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/reagent_containers/spray/plantbgone, diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index ed278f83aaf4..152cd90f2bae 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -216,7 +216,8 @@ containertype = /obj/structure/closet/crate/secure/plasma containername = "energy gun crate" -/datum/supply_packs/security/armory/epistol // costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person +/// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person +/datum/supply_packs/security/armory/epistol name = "Energy Pistol Crate" contains = list(/obj/item/gun/energy/gun/mini, /obj/item/gun/energy/gun/mini, @@ -330,7 +331,8 @@ cost = 200 containername = "security clothing crate" -/datum/supply_packs/security/officerpack // Starter pack for an officer. Contains everything in a locker but backpack (officer already start with one). Convenient way to equip new officer on highpop. +/// Starter pack for an officer. Contains everything in a locker but backpack (officer already start with one). Convenient way to equip new officer on highpop. +/datum/supply_packs/security/officerpack name = "Officer Starter Pack" contains = list(/obj/item/clothing/suit/armor/vest/security, /obj/item/radio/headset/headset_sec/alt, diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 89a19ebcb97c..1dad1daa084f 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -329,7 +329,8 @@ parent_organ = "l_arm" slot = "l_arm_device" -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced /// ERT implant, i dont overly expect this to get into the hands of crew +/// ERT implant, i dont overly expect this to get into the hands of crew +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced name = "advanced janitorial toolset implant" desc = "A set of advanced janitorial tools hidden behind a concealed panel on the user's arm." contents = newlist(/obj/item/mop/advanced, /obj/item/soap/deluxe, /obj/item/lightreplacer/bluespace, /obj/item/holosign_creator/janitor, /obj/item/melee/flyswatter, /obj/item/reagent_containers/spray/cleaner/advanced) @@ -338,7 +339,8 @@ action_icon_state = list(/datum/action/item_action/organ_action/toggle = "janibelt") emp_proof = TRUE -/obj/item/organ/internal/cyberimp/arm/janitorial/advanced/l /// its for ERT, but still probably a good idea. +/// its for ERT, but still probably a good idea. +/obj/item/organ/internal/cyberimp/arm/janitorial/advanced/l parent_organ = "l_arm" slot = "l_arm_device" diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 54a1b0203168..e0733411b137 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -240,7 +240,8 @@ REMOVE_TRAIT(M, TRAIT_COMIC_SANS, "augment") return ..() -/obj/item/organ/internal/cyberimp/brain/speech_translator //actual translating done in human/handle_speech_problems +// actual translating done in human/handle_speech_problems +/obj/item/organ/internal/cyberimp/brain/speech_translator name = "Speech translator implant" desc = "While known as a translator, this implant actually generates speech based on the user's thoughts when activated, completely bypassing the need to speak." implant_color = "#C0C0C0" diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index f16ef7cecd8f..ab99f91591a0 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -234,26 +234,26 @@ // This is has more potential uses, and is probably faster than the old proc. /proc/get_safe_blood(bloodtype) - . = list() + . = list(BLOOD_TYPE_FAKE_BLOOD) if(!bloodtype) return switch(bloodtype) if("A-") - return list("A-", "O-") + . += list("A-", "O-") if("A+") - return list("A-", "A+", "O-", "O+") + . += list("A-", "A+", "O-", "O+") if("B-") - return list("B-", "O-") + . += list("B-", "O-") if("B+") - return list("B-", "B+", "O-", "O+") + . += list("B-", "B+", "O-", "O+") if("AB-") - return list("A-", "B-", "O-", "AB-") + . += list("A-", "B-", "O-", "AB-") if("AB+") - return list("A-", "A+", "B-", "B+", "O-", "O+", "AB-", "AB+") + . += list("A-", "A+", "B-", "B+", "O-", "O+", "AB-", "AB+") if("O-") - return list("O-") + . += list("O-") if("O+") - return list("O-", "O+") + . += list("O-", "O+") //to add a splatter of blood or other mob liquid. /mob/living/proc/add_splatter_floor(turf/T, small_drip, shift_x, shift_y, emittor_intertia) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 700232bf3fe4..373303286c60 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -211,7 +211,8 @@ #define ONE_SHATTERED 1 #define BOTH_SHATTERED 2 -/obj/item/organ/internal/eyes/cybernetic/eyesofgod //no occuline allowed +// no occuline allowed +/obj/item/organ/internal/eyes/cybernetic/eyesofgod name = "\improper Eyes of the Gods" desc = "Two eyes said to belong to the gods. But such vision comes at a price." icon_state = "eyesofgod" diff --git a/code/modules/surgery/organs/organ_datums/lung_datum.dm b/code/modules/surgery/organs/organ_datums/lung_datum.dm index c939bbab6511..2bec8cdc8d17 100644 --- a/code/modules/surgery/organs/organ_datums/lung_datum.dm +++ b/code/modules/surgery/organs/organ_datums/lung_datum.dm @@ -65,13 +65,13 @@ H.adjustOxyLoss(5) if(safe_oxygen_min) - H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + H.throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) else if(safe_toxins_min) - H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) + H.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox) else if(safe_co2_min) - H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) + H.throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2) else if(safe_nitro_min) - H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro) + H.throw_alert("not_enough_nitro", /atom/movable/screen/alert/not_enough_nitro) return FALSE @@ -95,7 +95,7 @@ if(O2_pp > safe_oxygen_max) var/ratio = (breath.oxygen / safe_oxygen_max / safe_oxygen_max) * 10 H.apply_damage_type(clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type) - H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy) + H.throw_alert("too_much_oxy", /atom/movable/screen/alert/too_much_oxy) else H.clear_alert("too_much_oxy") @@ -103,7 +103,7 @@ if(safe_oxygen_min) if(O2_pp < safe_oxygen_min) gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath.oxygen) - H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) + H.throw_alert("not_enough_oxy", /atom/movable/screen/alert/not_enough_oxy) else H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS) gas_breathed = breath.oxygen @@ -121,7 +121,7 @@ if(N2_pp > safe_nitro_max) var/ratio = (breath.nitrogen / safe_nitro_max) * 10 H.apply_damage_type(clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type) - H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro) + H.throw_alert("too_much_nitro", /atom/movable/screen/alert/too_much_nitro) else H.clear_alert("too_much_nitro") @@ -129,7 +129,7 @@ if(safe_nitro_min) if(N2_pp < safe_nitro_min) gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath.nitrogen) - H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro) + H.throw_alert("not_enough_nitro", /atom/movable/screen/alert/not_enough_nitro) else H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS) gas_breathed = breath.nitrogen @@ -152,7 +152,7 @@ H.apply_damage_type(HUMAN_MAX_OXYLOSS, co2_damage_type) // Lets hurt em a little, let them know we mean business if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good! H.apply_damage_type(15, co2_damage_type) - H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2) + H.throw_alert("too_much_co2", /atom/movable/screen/alert/too_much_co2) if(prob(20)) // Lets give them some chance to know somethings not right though I guess. H.emote("cough") @@ -164,7 +164,7 @@ if(safe_co2_min) if(CO2_pp < safe_co2_min) gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath.carbon_dioxide) - H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) + H.throw_alert("not_enough_co2", /atom/movable/screen/alert/not_enough_co2) else H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS) gas_breathed = breath.carbon_dioxide @@ -183,7 +183,7 @@ if(Toxins_pp > safe_toxins_max) var/ratio = (breath.toxins / safe_toxins_max) * 10 H.apply_damage_type(clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type) - H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox) + H.throw_alert("too_much_tox", /atom/movable/screen/alert/too_much_tox) else H.clear_alert("too_much_tox") @@ -192,7 +192,7 @@ if(safe_toxins_min) if(Toxins_pp < safe_toxins_min) gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath.toxins) - H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) + H.throw_alert("not_enough_tox", /atom/movable/screen/alert/not_enough_tox) else H.adjustOxyLoss(-HUMAN_MAX_OXYLOSS) gas_breathed = breath.toxins diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 4468194ed880..2f41331f7e41 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -207,7 +207,7 @@ parent.children.Add(src) if(owner.has_embedded_objects()) - owner.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject) + owner.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject) /obj/item/organ/external/attempt_become_organ(obj/item/organ/external/parent,mob/living/carbon/human/H) if(parent_organ != parent.limb_name) @@ -926,7 +926,7 @@ Note that amputating the affected organ does in fact remove the infection from t forceMove(T) /obj/item/organ/external/proc/add_embedded_object(obj/item/I) - owner.throw_alert("embeddedobject", /obj/screen/alert/embeddedobject) + owner.throw_alert("embeddedobject", /atom/movable/screen/alert/embeddedobject) embedded_objects += I I.forceMove(owner) RegisterSignal(I, COMSIG_MOVABLE_MOVED, PROC_REF(remove_embedded_object)) diff --git a/code/modules/surgery/organs/subtypes/diona_organs.dm b/code/modules/surgery/organs/subtypes/diona_organs.dm index f015da30d204..896685a7be5d 100644 --- a/code/modules/surgery/organs/subtypes/diona_organs.dm +++ b/code/modules/surgery/organs/subtypes/diona_organs.dm @@ -71,7 +71,8 @@ /obj/item/organ/diona/process() return -/obj/item/organ/internal/heart/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/heart/diona name = "neural strata" icon = 'icons/obj/objects.dmi' icon_state = "nymph" @@ -81,29 +82,34 @@ icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/brain/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/brain/diona name = "gas bladder" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/kidneys/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/kidneys/diona name = "polyp segment" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/appendix/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/appendix/diona name = "anchoring ligament" icon = 'icons/obj/objects.dmi' icon_state = "nymph" -/obj/item/organ/internal/eyes/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/eyes/diona name = "receptor node" icon = 'icons/mob/alien.dmi' icon_state = "claw" //TODO:Make absorb rads on insert -/obj/item/organ/internal/liver/diona // Turns into a nymph instantly, no transplanting possible. +/// Turns into a nymph instantly, no transplanting possible. +/obj/item/organ/internal/liver/diona name = "nutrient vessel" icon = 'icons/mob/alien.dmi' icon_state = "claw" diff --git a/code/modules/surgery/organs/subtypes/tajaran_organs.dm b/code/modules/surgery/organs/subtypes/tajaran_organs.dm index 011cdb09c61a..055228c7a492 100644 --- a/code/modules/surgery/organs/subtypes/tajaran_organs.dm +++ b/code/modules/surgery/organs/subtypes/tajaran_organs.dm @@ -10,7 +10,8 @@ replace_colours = TRITANOPIA_COLOR_REPLACE see_in_dark = 4 -/obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. +/// Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness. +/obj/item/organ/internal/eyes/tajaran/farwa name = "farwa eyeballs" colourmatrix = MATRIX_TAJ_CBLIND see_in_dark = 3 diff --git a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm index 42a632a37bec..326996284c34 100644 --- a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm +++ b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm @@ -10,7 +10,8 @@ replace_colours = PROTANOPIA_COLOR_REPLACE see_in_dark = 4 -/obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. +/// Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness. +/obj/item/organ/internal/eyes/vulpkanin/wolpin name = "wolpin eyeballs" colourmatrix = MATRIX_VULP_CBLIND see_in_dark = 3 diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index f07d89797b99..b7b2d0f74191 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -35,7 +35,8 @@ GLOBAL_DATUM_INIT(clap_words, /regex, regex("clap|applaud")) GLOBAL_DATUM_INIT(honk_words, /regex, regex("ho+nk")) //hooooooonk GLOBAL_DATUM_INIT(multispin_words, /regex, regex("like a record baby")) -/obj/item/organ/internal/vocal_cords //organs that are activated through speech with the :x channel +/// organs that are activated through speech with the :x channel +/obj/item/organ/internal/vocal_cords name = "vocal cords" icon_state = "appendix" slot = "vocal_cords" diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index ecf8f7d3424c..cc4f1ccea022 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -173,7 +173,8 @@ ) return SURGERY_STEP_RETRY -/datum/surgery_step/fix_dead_tissue //Debridement +/// Debridement +/datum/surgery_step/fix_dead_tissue name = "remove dead tissue" allowed_tools = list( TOOL_SCALPEL = 100, diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 214350e63268..ce09847c4a87 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -138,14 +138,16 @@ /* * Researchable Scalpels */ -/obj/item/scalpel/laser //parent type +/// parent type +/obj/item/scalpel/laser name = "laser scalpel" desc = "A scalpel augmented with a directed laser." icon_state = "scalpel_laser1_on" damtype = "fire" hitsound = 'sound/weapons/sear.ogg' -/obj/item/scalpel/laser/laser1 //lasers also count as catuarys +/// lasers also count as catuarys +/obj/item/scalpel/laser/laser1 name = "laser scalpel" desc = "A scalpel augmented with a directed laser. This one looks basic and could be improved." icon_state = "scalpel_laser1_on" @@ -163,7 +165,8 @@ icon_state = "scalpel_laser3_on" toolspeed = 0.4 -/obj/item/scalpel/laser/manager //super tool! Retractor/hemostat +/// super tool! Retractor/hemostat +/obj/item/scalpel/laser/manager name = "incision management system" desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps." icon_state = "scalpel_manager_on" diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index d6111c01b85f..f11341127f1e 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -13,7 +13,7 @@ Configuration: Usage: - Define mouse event procs on your (probably HUD) object and simply call the show and hide procs respectively: - /obj/screen/hud + /atom/movable/screen/hud MouseEntered(location, control, params) usr.client.tooltip.show(params, title = src.name, content = src.desc) diff --git a/code/modules/vehicle/janivehicle.dm b/code/modules/vehicle/janivehicle.dm index 492da4410228..2be7e94a2396 100644 --- a/code/modules/vehicle/janivehicle.dm +++ b/code/modules/vehicle/janivehicle.dm @@ -11,7 +11,12 @@ /// Does it clean the tile under it? var/floorbuffer = FALSE +/obj/vehicle/janicart/Initialize(mapload) + . = ..() + GLOB.janitorial_equipment += src + /obj/vehicle/janicart/Destroy() + GLOB.janitorial_equipment -= src QDEL_NULL(mybag) return ..() diff --git a/code/modules/vote/vote_presets.dm b/code/modules/vote/vote_presets.dm index 069986746285..6927fa4fea7c 100644 --- a/code/modules/vote/vote_presets.dm +++ b/code/modules/vote/vote_presets.dm @@ -35,7 +35,7 @@ /datum/vote/map/announce() ..() for(var/mob/M in GLOB.player_list) - M.throw_alert("Map Vote", /obj/screen/alert/notify_mapvote, timeout_override = GLOB.configuration.vote.vote_time) + M.throw_alert("Map Vote", /atom/movable/screen/alert/notify_mapvote, timeout_override = GLOB.configuration.vote.vote_time) /datum/vote/map/handle_result(result) // Find target map. diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi index afddb44f48ad..9c265a8f5e28 100755 Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ diff --git a/modular_ss220/cinematics/code/_cinematics.dm b/modular_ss220/cinematics/code/_cinematics.dm index 86691ee2287a..b71c4878c8a3 100644 --- a/modular_ss220/cinematics/code/_cinematics.dm +++ b/modular_ss220/cinematics/code/_cinematics.dm @@ -18,7 +18,7 @@ return playing /// The cinematic screen showed to everyone -/obj/screen/cinematic +/atom/movable/screen/cinematic icon = 'icons/effects/station_explosion.dmi' icon_state = "station_intact" plane = SPLASHSCREEN_PLANE @@ -37,7 +37,7 @@ /// Whether the cinematic is a global cinematic or not var/is_global = FALSE /// Refernce to the cinematic screen shown to everyohne - var/obj/screen/cinematic/screen + var/atom/movable/screen/cinematic/screen /// Callbacks passed that occur during the animation var/datum/callback/special_callback /// How long for the final screen remains shown @@ -45,7 +45,7 @@ /// Whether the cinematic turns off ooc when played globally. var/stop_ooc = TRUE // screen type for cinematic backdrop - var/backdrop_type = /obj/screen/fullscreen/cinematic_backdrop + var/backdrop_type = /atom/movable/screen/fullscreen/cinematic_backdrop /datum/cinematic/New(watcher, datum/callback/special_callback) screen = new(src) @@ -75,7 +75,7 @@ ooc_toggled = TRUE toggle_ooc() - // Place the /obj/screen/cinematic into everyone's screens, and prevent movement. + // Place the /atom/movable/screen/cinematic into everyone's screens, and prevent movement. for(var/mob/watching_mob in watchers) show_to(watching_mob, watching_mob.client) RegisterSignal(watching_mob, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(show_to)) diff --git a/modular_ss220/cinematics/code/cinematics/credits.dm b/modular_ss220/cinematics/code/cinematics/credits.dm index 388e7580a878..e6e83557e80f 100644 --- a/modular_ss220/cinematics/code/cinematics/credits.dm +++ b/modular_ss220/cinematics/code/cinematics/credits.dm @@ -2,11 +2,11 @@ is_global = TRUE should_lock_watchers = FALSE stop_ooc = FALSE - backdrop_type = /obj/screen/fullscreen/cinematic_backdrop/credits + backdrop_type = /atom/movable/screen/fullscreen/cinematic_backdrop/credits /datum/cinematic/credits/New(watcher, datum/callback/special_callback) . = ..() - screen = new /obj/screen/cinematic/credits(src) + screen = new /atom/movable/screen/cinematic/credits(src) /datum/cinematic/credits/start_cinematic(list/watchers) if(!(SEND_GLOBAL_SIGNAL(COMSIG_GLOB_PLAY_CINEMATIC, src) & COMPONENT_GLOB_BLOCK_CINEMATIC)) @@ -49,36 +49,36 @@ /datum/cinematic/credits/halloween/New(watcher, datum/callback/special_callback) . = ..() - screen = new /obj/screen/cinematic/credits/halloween() + screen = new /atom/movable/screen/cinematic/credits/halloween() /datum/cinematic/credits/new_year /datum/cinematic/credits/new_year/New(watcher, datum/callback/special_callback) . = ..() - screen = new /obj/screen/cinematic/credits/new_year() + screen = new /atom/movable/screen/cinematic/credits/new_year() -/obj/screen/cinematic/credits +/atom/movable/screen/cinematic/credits icon_state = "blank" alpha = 0 -/obj/screen/cinematic/credits/Initialize(mapload) +/atom/movable/screen/cinematic/credits/Initialize(mapload) . = ..() animate(src, alpha = 120, time = 3 SECONDS) -/obj/screen/cinematic/credits/halloween +/atom/movable/screen/cinematic/credits/halloween icon = 'modular_ss220/cinematics/icons/backdrops.dmi' icon_state = "halloween" -/obj/screen/cinematic/credits/new_year +/atom/movable/screen/cinematic/credits/new_year icon = 'modular_ss220/cinematics/icons/backdrops.dmi' icon_state = "new_year" -/obj/screen/fullscreen/cinematic_backdrop/credits +/atom/movable/screen/fullscreen/cinematic_backdrop/credits alpha = 0 -/obj/screen/fullscreen/cinematic_backdrop/credits/Initialize(mapload) +/atom/movable/screen/fullscreen/cinematic_backdrop/credits/Initialize(mapload) . = ..() animate(src, alpha = 220, time = 3 SECONDS) diff --git a/modular_ss220/cinematics/code/cinematics_screen.dm b/modular_ss220/cinematics/code/cinematics_screen.dm index 678a5fa6391f..77df18d85b61 100644 --- a/modular_ss220/cinematics/code/cinematics_screen.dm +++ b/modular_ss220/cinematics/code/cinematics_screen.dm @@ -1,4 +1,4 @@ -/obj/screen/fullscreen/cinematic_backdrop +/atom/movable/screen/fullscreen/cinematic_backdrop icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" icon_state = "flash" diff --git a/modular_ss220/credits/code/credits.dm b/modular_ss220/credits/code/credits.dm index 2b73edf9c46a..d7a71e3fdec8 100644 --- a/modular_ss220/credits/code/credits.dm +++ b/modular_ss220/credits/code/credits.dm @@ -43,7 +43,7 @@ for(var/client/client in clients) LAZYINITLIST(client.credits) - var/obj/screen/credit/logo = new /obj/screen/credit/logo(null, "", clients) + var/atom/movable/screen/credit/logo = new /atom/movable/screen/credit/logo(null, "", clients) screen_credits += logo addtimer(CALLBACK(src, PROC_REF(start_rolling_credits_for_clients), clients), delay_time) @@ -59,11 +59,11 @@ addtimer(CALLBACK(src, PROC_REF(clear_credits_for_clients), clients), SScredits.credit_roll_speed) /datum/credits/proc/start_rolling_logo() - var/obj/screen/credit/logo/logo = screen_credits[1] + var/atom/movable/screen/credit/logo/logo = screen_credits[1] logo.rollem() /datum/credits/proc/start_rolling_credit_item(list/client/clients, credit_item) - var/obj/screen/credit/title = new(null, credit_item, clients) + var/atom/movable/screen/credit/title = new(null, credit_item, clients) screen_credits += title title.rollem() @@ -372,7 +372,7 @@ content += "
" content += "
[jointext(disclaimer, null)]
" -/obj/screen/credit +/atom/movable/screen/credit icon_state = "blank" mouse_opacity = 0 alpha = 255 @@ -381,7 +381,7 @@ var/list/client/watchers = list() -/obj/screen/credit/Initialize(mapload, credited, list/client/clients) +/atom/movable/screen/credit/Initialize(mapload, credited, list/client/clients) . = ..() for(var/client/watcher in clients) @@ -398,7 +398,7 @@ maptext_height = world.icon_size * 2 maptext_width = world.icon_size * 14 -/obj/screen/credit/proc/rollem() +/atom/movable/screen/credit/proc/rollem() var/matrix/matrix = matrix(transform) transform = matrix.Translate(0, -world.icon_size) @@ -406,11 +406,11 @@ animate(src, transform = matrix, time = SScredits.credit_roll_speed) addtimer(CALLBACK(src, PROC_REF(delete_credit)), SScredits.credit_roll_speed, TIMER_CLIENT_TIME) -/obj/screen/credit/proc/delete_credit() +/atom/movable/screen/credit/proc/delete_credit() if(!QDELETED(src)) qdel(src) -/obj/screen/credit/Destroy() +/atom/movable/screen/credit/Destroy() for(var/client/watcher in watchers) if(!watcher) continue @@ -421,14 +421,14 @@ return ..() -/obj/screen/credit/logo +/atom/movable/screen/credit/logo icon = 'modular_ss220/credits/icons/logo.dmi' icon_state = "ss220" screen_loc = "CENTER - 2,CENTER" alpha = 100 -/obj/screen/credit/logo/Initialize(mapload, credited, list/client/clients) +/atom/movable/screen/credit/logo/Initialize(mapload, credited, list/client/clients) . = ..() animate(src, alpha = 220, time = 3 SECONDS) maptext = "

Playing music - [SScredits.title_music]

" @@ -436,7 +436,7 @@ maptext_x -= 5 * world.icon_size maptext_y += 6 * world.icon_size -/obj/screen/credit/logo/rollem() +/atom/movable/screen/credit/logo/rollem() var/matrix/matrix = matrix(transform) matrix.Translate(0, SScredits.credit_animate_height) animate(src, transform = matrix, time = SScredits.credit_roll_speed) diff --git a/modular_ss220/credits/code/halloween_credits.dm b/modular_ss220/credits/code/halloween_credits.dm index 1cc414679c89..bbdf7e6f2e8f 100644 --- a/modular_ss220/credits/code/halloween_credits.dm +++ b/modular_ss220/credits/code/halloween_credits.dm @@ -17,7 +17,7 @@ for(var/client/client in clients) LAZYINITLIST(client.credits) - var/obj/screen/credit/logo = new /obj/screen/credit/halloween(null, "", clients) + var/atom/movable/screen/credit/logo = new /atom/movable/screen/credit/halloween(null, "", clients) screen_credits += logo addtimer(CALLBACK(src, PROC_REF(start_rolling_credits_for_clients), clients), delay_time) @@ -174,14 +174,14 @@ if(length(goodboys)) content += "

Духи:

[english_list(goodboys, and_text = " и ")]

" -/obj/screen/credit/halloween +/atom/movable/screen/credit/halloween icon = 'modular_ss220/credits/icons/logo.dmi' icon_state = "halloween" screen_loc = "CENTER - 2,CENTER + 1" appearance_flags = NO_CLIENT_COLOR | TILE_BOUND | PIXEL_SCALE alpha = 255 -/obj/screen/credit/halloween/Initialize(mapload, credited, list/client/clients) +/atom/movable/screen/credit/halloween/Initialize(mapload, credited, list/client/clients) . = ..() plane++ @@ -194,7 +194,7 @@ transform = transform.Translate(-8 * world.icon_size, 0) animate(src, transform = matrix, time = 5 SECONDS, flags = ANIMATION_PARALLEL) -/obj/screen/credit/halloween/rollem() +/atom/movable/screen/credit/halloween/rollem() var/matrix/matrix = matrix(transform) matrix.Translate(0, SScredits.credit_animate_height) animate(src, transform = matrix, time = SScredits.credit_roll_speed) diff --git a/modular_ss220/gunhud/code/gunhud_component.dm b/modular_ss220/gunhud/code/gunhud_component.dm index 57296fdfdddf..9796edc1bddf 100644 --- a/modular_ss220/gunhud/code/gunhud_component.dm +++ b/modular_ss220/gunhud/code/gunhud_component.dm @@ -1,5 +1,5 @@ /datum/component/gunhud - var/obj/screen/ammo_counter/hud + var/atom/movable/screen/ammo_counter/hud /datum/component/gunhud/Initialize() . = ..() diff --git a/modular_ss220/gunhud/code/gunhud_hud.dm b/modular_ss220/gunhud/code/gunhud_hud.dm index e4e5a728e60a..3565d7110b04 100644 --- a/modular_ss220/gunhud/code/gunhud_hud.dm +++ b/modular_ss220/gunhud/code/gunhud_hud.dm @@ -1,9 +1,9 @@ /datum/hud - var/obj/screen/ammo_counter + var/atom/movable/screen/ammo_counter /datum/hud/human/New(mob/living/carbon/human/owner, ui_style, ui_color, ui_alpha) . = ..() - ammo_counter = new /obj/screen/ammo_counter() + ammo_counter = new /atom/movable/screen/ammo_counter() ammo_counter.hud = src infodisplay += ammo_counter @@ -21,7 +21,7 @@ * Check the gunhud.dmi for all available icons you can use. */ -/obj/screen/ammo_counter +/atom/movable/screen/ammo_counter name = "ammo counter" icon = 'modular_ss220/gunhud/icons/gunhud.dmi' icon_state = "backing" @@ -44,7 +44,7 @@ var/indicator ///This proc simply resets the hud to standard and removes it from the players visible hud. -/obj/screen/ammo_counter/proc/turn_off() +/atom/movable/screen/ammo_counter/proc/turn_off() invisibility = INVISIBILITY_ABSTRACT maptext = null backing_color = COLOR_RED @@ -56,11 +56,11 @@ update_appearance() ///This proc turns the hud on, but does not set it to anything other than the currently set values -/obj/screen/ammo_counter/proc/turn_on() +/atom/movable/screen/ammo_counter/proc/turn_on() invisibility = 0 ///This is the main proc for altering the hud's appeareance, it controls the setting of the overlays. Use the OTH and below variables to set it accordingly. -/obj/screen/ammo_counter/proc/set_hud(_backing_color, _oth_o, _oth_t, _oth_h, _indicator, _oth_backing = "oth_light") +/atom/movable/screen/ammo_counter/proc/set_hud(_backing_color, _oth_o, _oth_t, _oth_h, _indicator, _oth_backing = "oth_light") backing_color = _backing_color oth_backing = _oth_backing oth_o = _oth_o @@ -70,7 +70,7 @@ update_appearance() -/obj/screen/ammo_counter/update_overlays() +/atom/movable/screen/ammo_counter/update_overlays() . = ..() if(oth_backing) var/mutable_appearance/oth_backing_overlay = mutable_appearance(icon, oth_backing) diff --git a/modular_ss220/mobs/code/pet_carrier.dm b/modular_ss220/mobs/code/pet_carrier.dm index 453499dd4c88..e710018e5a04 100644 --- a/modular_ss220/mobs/code/pet_carrier.dm +++ b/modular_ss220/mobs/code/pet_carrier.dm @@ -251,7 +251,7 @@ try_free_content(T, usr) return TRUE - if(!(istype(over_object, /obj/screen))) + if(!is_screen_atom(over_object)) return ..() if(!(loc == usr) || (loc && loc.loc == usr)) return diff --git a/modular_ss220/screentip_change/code/screentip.dm b/modular_ss220/screentip_change/code/screentip.dm index 3a4ba41f16b1..912160cb30d9 100644 --- a/modular_ss220/screentip_change/code/screentip.dm +++ b/modular_ss220/screentip_change/code/screentip.dm @@ -1,2 +1,2 @@ -/obj/screen/screentip +/atom/movable/screen/screentip maptext_y = 0 diff --git a/modular_ss220/silicons/code/items/rlf.dm b/modular_ss220/silicons/code/items/rlf.dm index 1bb4b71c29e5..ef09085778e1 100644 --- a/modular_ss220/silicons/code/items/rlf.dm +++ b/modular_ss220/silicons/code/items/rlf.dm @@ -22,10 +22,10 @@ to_chat(user, span_warning("You offer lollipop to [receiver], but they don't seem to respond...")) return var/obj/item/I = new /obj/item/food/snacks/candy/sucker/lollipop - receiver.throw_alert("take item [I.UID()]", /obj/screen/alert/take_item/RLF, alert_args = list(user, receiver, I)) + receiver.throw_alert("take item [I.UID()]", /atom/movable/screen/alert/take_item/RLF, alert_args = list(user, receiver, I)) to_chat(user, span_info("You offer lollipop to [receiver].")) -/obj/screen/alert/take_item/RLF/Click(location, control, params) +/atom/movable/screen/alert/take_item/RLF/Click(location, control, params) var/mob/living/receiver = locateUID(receiver_UID) if(receiver.stat != CONSCIOUS) return diff --git a/tgui/packages/tgui/interfaces/NTRecruiter.js b/tgui/packages/tgui/interfaces/NTRecruiter.js index 9ff6a44446b6..eeab78b429cc 100644 --- a/tgui/packages/tgui/interfaces/NTRecruiter.js +++ b/tgui/packages/tgui/interfaces/NTRecruiter.js @@ -7,7 +7,7 @@ export const NTRecruiter = (props, context) => { const { gamestatus, cand_name, - cand_gender, + cand_birth, cand_age, cand_species, cand_planet, @@ -125,6 +125,10 @@ export const NTRecruiter = (props, context) => { Keep your eyes open for incompatible naming schemes, no company wants a Vox named Joe! + + For some unknown reason clowns are never denied by the + company, no matter what. + @@ -153,14 +157,14 @@ export const NTRecruiter = (props, context) => { {cand_name} - - {cand_gender} + + {cand_species} {cand_age} - - {cand_species} + + {cand_birth} {cand_planet} @@ -237,7 +241,7 @@ export const NTRecruiter = (props, context) => {