From cd1389ae0faaf884517fbb33fa3c27e76810ba41 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Tue, 2 Aug 2022 22:59:59 -0700 Subject: [PATCH 01/11] fix catwalks --- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/turfs/open/floor/catwalk_plating.dm | 22 +++++++++++------- icons/turf/floors/catwalk_plating.dmi | Bin 396 -> 484 bytes 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 728e5fd726..588e066a41 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -561,4 +561,4 @@ singular_name = "catwalk floor tile" desc = "Flooring that shows its contents underneath. Engineers love it!" icon_state = "catwalk_tile" - turf_type = /turf/open/floor/plating/catwalk_floor + turf_type = /turf/open/floor/catwalk_floor diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm index 76d22847c9..ac0f3b63de 100644 --- a/code/game/turfs/open/floor/catwalk_plating.dm +++ b/code/game/turfs/open/floor/catwalk_plating.dm @@ -5,7 +5,7 @@ * you can crowbar it to interact with the underneath stuff without destroying the tile... * unless you want to! */ -/turf/open/floor/plating/catwalk_floor +/turf/open/floor/catwalk_floor icon = 'icons/turf/floors/catwalk_plating.dmi' icon_state = "catwalk_below" floor_tile = /obj/item/stack/tile/catwalk @@ -16,29 +16,35 @@ barefootstep = FOOTSTEP_CATWALK clawfootstep = FOOTSTEP_CATWALK heavyfootstep = FOOTSTEP_CATWALK + intact = FALSE var/covered = TRUE -/turf/open/floor/plating/catwalk_floor/Initialize(mapload) +/turf/open/floor/catwalk_floor/Initialize(mapload) . = ..() layer = CATWALK_LAYER update_icon(UPDATE_OVERLAYS) -/turf/open/floor/plating/catwalk_floor/update_overlays() +/turf/open/floor/catwalk_floor/update_overlays() . = ..() - var/static/catwalk_overlay + var/static/image/catwalk_overlay if(isnull(catwalk_overlay)) - catwalk_overlay = iconstate2appearance(icon, "catwalk_above") + catwalk_overlay = new() + catwalk_overlay.icon = icon + catwalk_overlay.icon_state = "catwalk_above" + catwalk_overlay.plane = GAME_PLANE + catwalk_overlay.layer = CATWALK_LAYER + catwalk_overlay = catwalk_overlay.appearance if(covered) . += catwalk_overlay -/turf/open/floor/plating/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool) +/turf/open/floor/catwalk_floor/screwdriver_act(mob/living/user, obj/item/tool) . = ..() covered = !covered user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]") update_icon(UPDATE_OVERLAYS) -/turf/open/floor/plating/catwalk_floor/pry_tile(obj/item/crowbar, mob/user, silent) +/turf/open/floor/catwalk_floor/crowbar_act(mob/user, obj/item/I) if(covered) user.balloon_alert(user, "remove cover first!") return FALSE - . = ..() + return pry_tile(I, user) diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi index 24954e4a1750d3b11ff73bdcaf4b85fdae67ba5d..c9ad36653bbdef679308599ea8fcbbbe22670adf 100644 GIT binary patch delta 363 zcmV-x0hIoX1LOmc7e7D*0{{R3SVwH_0000OP)t-s0000nI6Fp7OH*81B_%8^Gd3wN zF&ZEu^8vZb1%CjmiqH zelB2N002rmJef8tXBV&E>;4-$N%@dC^>-n5bn~Pz>SV62U ze|&6rL8Z)8k`NenUAyWCfn@uYD{6vDq;N$Ef)kc$!2#G}H-8V51-$NM{-{q_h`9x| zS&5pERuJ0Fz;+At9+XeTP#!>#ClbIsKmwQtNMLl?=yDs|v*`$d)M>5LD7I%!O@O!e z{)E59bHb2yu1EntM6SN}D}KQO<^dAGAw0l>z;2>EfS^18+yFS%Y=YJ7+v)%S002ov JPDHLkV1h!-mzDqk delta 274 zcmV+t0qy?e1B?TZ7d#*Y0{{R3P_tvV0000LP)t-s0000}Tw59-A}upEDK9ZGI6Fp7 zOXqhD-2eap0d!JMQvg8b*k%9#0D6&DZ-2$5T3Nx>&jsul03P`(Te1V(Bme*apGibP zR5*=eNEAc?N$7kAu{0DQjLv5eOIAVvWuO8yK7*K%u`&Xg38V8F#FSl3oLx+ULqMdn zny{EMg8?%fsR0$3xum$cq=bclNH?GfW()~za0D{JIL#~>j(`f#_(Yg6Y6a8^rAs6= zIKpa0Xlht!s+%i_3>&n*7z$P-BO3|IIH-JJ)-y%`Gf>t; Date: Wed, 3 Aug 2022 06:01:35 -0500 Subject: [PATCH 02/11] it works --- code/modules/mob/mob_helpers.dm | 13 +++++++++++++ code/modules/projectiles/gun.dm | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 8595839831..224fc73405 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -250,7 +250,20 @@ It's fairly easy to fix if dealing with single letters but not so much with comp animate(pixel_x=rand(min,max), pixel_y=rand(min,max), time=1) animate(pixel_x=oldx, pixel_y=oldy, time=1) +/proc/directional_recoil(mob/M, strength=1, angle = 0) + if(!M || !M.client) + return + var/client/C = M.client + var/recoil_x = -sin(angle)*4*strength + rand(-strength, strength) + var/recoil_y = -cos(angle)*4*strength + rand(-strength, strength) + animate(C, pixel_x=recoil_x, pixel_y=recoil_y, time=1, easing=SINE_EASING|EASE_OUT, flags=ANIMATION_PARALLEL|ANIMATION_RELATIVE) + addtimer(CALLBACK(GLOBAL_PROC, /proc/recoil_recover, M), 2) +/proc/recoil_recover(mob/M) + if(!M || !M.client) + return + var/client/C = M.client + animate(C, pixel_x=0, pixel_y=0, time=3, easing=SINE_EASING|EASE_IN) /proc/findname(msg) if(!istext(msg)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 3210ad2d15..765a5b50c9 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -159,7 +159,7 @@ /obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) if(recoil) - shake_camera(user, recoil + 1, recoil) + directional_recoil(user, recoil*5, Get_Angle(user, pbtarget)) // the *5 is a placeholder. the recoil goes hard if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss var/safe_cost = clamp(stam_cost, 0, user.stamina_buffer)*(firing && burst_size >= 2 ? 1/burst_size : 1) From 2d405f7bc8573f321194321740e54b17aec0df69 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 3 Aug 2022 06:29:22 -0500 Subject: [PATCH 03/11] nitpicky todo --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 765a5b50c9..cc44d9c74f 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -159,7 +159,7 @@ /obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) if(recoil) - directional_recoil(user, recoil*5, Get_Angle(user, pbtarget)) // the *5 is a placeholder. the recoil goes hard + directional_recoil(user, recoil*5, Get_Angle(user, pbtarget)) // the *5 is a placeholder. it could probably be cranked up tbh if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss var/safe_cost = clamp(stam_cost, 0, user.stamina_buffer)*(firing && burst_size >= 2 ? 1/burst_size : 1) From 449fead213024a8283865cf555ac8dca5e19138e Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 3 Aug 2022 22:14:25 -0300 Subject: [PATCH 04/11] adds a lack of eyes + dmieditor --- .vscode/settings.json | 2 +- .../modules/mob/living/carbon/human/species.dm | 8 ++++---- icons/mob/eyes.dmi | Bin 484 -> 1491 bytes 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bfce9bda7c..8edb013566 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -13,7 +13,7 @@ "source.fixAll.eslint": true }, "workbench.editorAssociations": { - "*.dmi": "imagePreview.previewEditor" + "*.dmi": "dmiEditor.dmiEditor" }, "files.eol": "\n", "gitlens.advanced.blame.customArguments": ["-w"], diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index ddbb23741b..afceabf2a6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -828,13 +828,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/left_state = DEFAULT_LEFT_EYE_STATE var/right_state = DEFAULT_RIGHT_EYE_STATE if(eye_type in GLOB.eye_types) - left_state = eye_type + "_left_eye" - right_state = eye_type + "_right_eye" + left_state = "[eye_type]_left_eye" + right_state = "[eye_type]_right_eye" var/mutable_appearance/left_eye = mutable_appearance('icons/mob/eyes.dmi', left_state, -BODY_LAYER) var/mutable_appearance/right_eye = mutable_appearance('icons/mob/eyes.dmi', right_state, -BODY_LAYER) if((EYECOLOR in species_traits) && has_eyes) - left_eye.color = "#" + H.left_eye_color - right_eye.color = "#" + H.right_eye_color + left_eye.color = "#[H.left_eye_color]" + right_eye.color = "#[H.right_eye_color]" if(OFFSET_EYES in offset_features) left_eye.pixel_x += offset_features[OFFSET_EYES][1] left_eye.pixel_y += offset_features[OFFSET_EYES][2] diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 4b8dba160aa1acf25944c05e0311877ef2195b0a..c4927ea06b757618d8f9e89be61c4a274fde6627 100644 GIT binary patch literal 1491 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$3`NDkP%BCAB!YD6^m>Ge3`k zp<>R|$s75a3yV@9e($ zutLjg+I;RR_GTyTZRt1DyiYoBnYLTeSL2~VRo-*P+}wjlH5M%qWsAKNcxh%;gJnI# z(z5}ly`0juB_5tmudg)TxkrpGcW3?I?r-|yTnjh;`^x=ZKjZ6LrGxPsJ}hifxiW!8 z`%-|b)Pjs-Zm+a|Y2V|v7twBiC9#IBQ6pr3nEdACnf~>kSf1|sVS8!ow|WK!mSdhS zjv*Cu-rkK3l6IGH2t0Xo-vis5zG4Dq6Kp$sTT{9MIHuOSpDO8pXQ}^bN{{KkCp)tk zm-R2d{F1?>RhoDYZ0+C9)L{8jMWN;ImFR}}O4jdL z{J$UWXLg>kok2j2I8-LixFPh*H@98p;`86rub(^Y&(gHv?s|rXuPh9QsEghyF`T}3Vq5pUdmTHg*V*4m z5-S&E*!Em$&T-T8NAI#6sQZ|lV_Sayb9?leM-^6c^9r;M$lX25#qgsP9x2pf?B;LC zU3FZ-_WQ+t`|j-L3FQeKo0$@(UM!aX`(yJ4CWf%vf4LYU{23H{sEXd`F(oX&@%D_t zYsqtoX4&aUKzo5U9aw$vTiT4DJkJffv(pk;84`ELGcvs9WN4u-dTYf{)*+kTcJq7z z-{M$n=H1NBH`awSaIa^&JsX_Fb=J*n6=i67TgS?4?*HEpKRjQr|L<~s{`T{W&u8l1 zZl1jD+vx^xmVJBV<^kn@XfbT?-p9{yLWqGwm@;H7cd2@h4BztUmtO=oB(6b<=r?JM zH;THS*ybPSG2ZFPFpaxtb?v3?H99-W`M3XY?#utZM1I>1_1e?No2tt(o1j;> lgLghliveQ;g=j-PgLEawiJh&JJ%Ob(gQu&X%Q~loCIBt*4cY(z delta 472 zcmV;}0Vn>`3*-Zk7JmTX0s{a50Ff_H!vFvP3{Xr|MZmzo|Ns90GylNAz_{GX(*OVf z0d!JMQvg8b*k%9#0KR%uSad{Xb7OL8aCB*JZU6vyoRyM64uUWcMc3^q8rT~Jwr&iB zu#hVdguyl`)U>09+lzo26Jw^kKgs+5Z6*|lEH6rt9t(a0>wlCP#9kzuEoXPtqMVL6 z;!J`%OI!|zHNq5wfU{OvH^m)iovnLV@*5b8?Q30W=&*tjK78_*w@(+T&>NKW`I)AV ztHD8o^!b&i3tDqMX`l;M-d7O$8X|8+?5l`96wTOZb8&RVtMEhd{ivbH%5;AH2OhEN zmjn7hX#fBKynjhVK~!jg?bfsl{llTttvdq;-&+c%7~`d-Af*(4yMyL}9Aj=N0Pv3%KMrbK z1vkIotj1N)yaNCL(Amk4M|-YUk#82vs-O(i`+ipAs!;#{0CZ-49Ex@8`9tpj0069s zuXj`9{?`Z0kL3jh{x1Lk@L{9KgPL3SEr>?W2LJ#ZR&{__Rto?CU+@6_MGpr1FFx%6 O0000 Date: Thu, 4 Aug 2022 11:06:16 +0800 Subject: [PATCH 05/11] fix --- .../file_system/programs/signaler.dm | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/signaler.dm b/code/modules/modular_computers/file_system/programs/signaler.dm index b7bbcacaa0..ded70f7f37 100644 --- a/code/modules/modular_computers/file_system/programs/signaler.dm +++ b/code/modules/modular_computers/file_system/programs/signaler.dm @@ -15,40 +15,29 @@ /// Radio connection datum used by signalers. var/datum/radio_frequency/radio_connection -/datum/computer_file/program/signaler/run_program(mob/living/user) - . = ..() - if (!.) - return - if(!computer?.get_modular_computer_part(MC_SIGNALER)) //Giving a clue to users why the program is spitting out zeros. - to_chat(user, span_warning("\The [computer] flashes an error: \"hardware\\signal_hardware\\startup.bin -- file not found\".")) - +/datum/computer_file/program/signaler/New() + set_frequency(signal_frequency) + return ..() /datum/computer_file/program/signaler/ui_data(mob/user) var/list/data = get_header_data() - var/obj/item/computer_hardware/radio_card/sensor = computer?.get_modular_computer_part(MC_SIGNALER) - if(sensor?.check_functionality()) - data["frequency"] = signal_frequency - data["code"] = signal_code - data["minFrequency"] = MIN_FREE_FREQ - data["maxFrequency"] = MAX_FREE_FREQ + data["frequency"] = signal_frequency + data["code"] = signal_code + data["minFrequency"] = MIN_FREE_FREQ + data["maxFrequency"] = MAX_FREE_FREQ return data /datum/computer_file/program/signaler/ui_act(action, list/params) . = ..() if(.) return - var/obj/item/computer_hardware/radio_card/sensor = computer?.get_modular_computer_part(MC_SIGNALER) - if(!(sensor?.check_functionality())) - playsound(src, 'sound/machines/scanbuzz.ogg', 100, FALSE) - return switch(action) if("signal") INVOKE_ASYNC(src, .proc/signal) . = TRUE if("freq") - signal_frequency = unformat_frequency(params["freq"]) - signal_frequency = sanitize_frequency(signal_frequency, TRUE) - set_frequency(signal_frequency) + var/new_signal_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) + set_frequency(new_signal_frequency) . = TRUE if("code") signal_code = text2num(params["code"]) From 959fa45d3c9e71ff32f35e1bb93bd62dc5788cfc Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 5 Aug 2022 16:00:19 -0500 Subject: [PATCH 06/11] client prefs! per-gun recoil multipliers! --- code/modules/client/preferences.dm | 8 +++++++- code/modules/mob/mob_helpers.dm | 11 ++++------- code/modules/projectiles/gun.dm | 5 ++++- code/modules/projectiles/guns/ballistic/revolver.dm | 1 + 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8a9f122f43..e4056233c6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -233,6 +233,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/screenshake = 100 var/damagescreenshake = 2 + var/recoil_screenshake = 100 var/arousable = TRUE var/autostand = TRUE var/auto_ooc = FALSE @@ -907,6 +908,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]
" if (user && user.client && !user.client.prefs.screenshake==0) dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
" + dat += "Recoil Screen Push: [(recoil_screenshake==100) ? "Full" : ((recoil_screenshake==0) ? "None" : "[screenshake]")]
" var/p_chaos if (!preferred_chaos) p_chaos = "No preference" @@ -2782,7 +2784,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("no_tetris_storage") no_tetris_storage = !no_tetris_storage if ("screenshake") - var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, 200 = maximum.)", "Character Preference", screenshake) as null|num + var/desiredshake = input(user, "Set the amount of screenshake you want. \n(0 = disabled, 100 = full, no maximum (at your own risk).)", "Character Preference", screenshake) as null|num if (!isnull(desiredshake)) screenshake = desiredshake if("damagescreenshake") @@ -2795,6 +2797,10 @@ GLOBAL_LIST_EMPTY(preferences_datums) damagescreenshake = 0 else damagescreenshake = 1 + if ("recoil_screenshake") + var/desiredshake = input(user, "Set the amount of recoil screenshake/push you want. \n(0 = disabled, 100 = full, no maximum (at your own risk).)", "Character Preference", screenshake) as null|num + if (!isnull(desiredshake)) + recoil_screenshake = desiredshake if("nameless") nameless = !nameless //END CITADEL EDIT diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 224fc73405..90a7aae95e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -254,16 +254,13 @@ It's fairly easy to fix if dealing with single letters but not so much with comp if(!M || !M.client) return var/client/C = M.client + var/client_screenshake = (C.prefs.recoil_screenshake * 0.01) + strength *= client_screenshake var/recoil_x = -sin(angle)*4*strength + rand(-strength, strength) var/recoil_y = -cos(angle)*4*strength + rand(-strength, strength) animate(C, pixel_x=recoil_x, pixel_y=recoil_y, time=1, easing=SINE_EASING|EASE_OUT, flags=ANIMATION_PARALLEL|ANIMATION_RELATIVE) - addtimer(CALLBACK(GLOBAL_PROC, /proc/recoil_recover, M), 2) - -/proc/recoil_recover(mob/M) - if(!M || !M.client) - return - var/client/C = M.client - animate(C, pixel_x=0, pixel_y=0, time=3, easing=SINE_EASING|EASE_IN) + animate(pixel_x=0, pixel_y=0, time=3, easing=SINE_EASING|EASE_IN) // according to bhjin this works on more recent byond versions + // if you havent updated uuh sucks to be you then /proc/findname(msg) if(!istext(msg)) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index cc44d9c74f..a4d3c3a63a 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -94,6 +94,9 @@ var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds + /// directional recoil multiplier + var/dir_recoil_amp = 10 + /obj/item/gun/Initialize(mapload) . = ..() if(no_pin_required) @@ -159,7 +162,7 @@ /obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) if(recoil) - directional_recoil(user, recoil*5, Get_Angle(user, pbtarget)) // the *5 is a placeholder. it could probably be cranked up tbh + directional_recoil(user, recoil*dir_recoil_amp, Get_Angle(user, pbtarget)) if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss var/safe_cost = clamp(stam_cost, 0, user.stamina_buffer)*(firing && burst_size >= 2 ? 1/burst_size : 1) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index fe42fc2d99..f3b07aa7a4 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -167,6 +167,7 @@ icon_state = "goldrevolver" fire_sound = 'sound/weapons/resonator_blast.ogg' recoil = 8 + dir_recoil_amp = 5 // 40 directional recoil is already really funny pin = /obj/item/firing_pin /obj/item/gun/ballistic/revolver/nagant From 44b23b873d7cf3386caac96a5037fbc94c8fe9c1 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 5 Aug 2022 17:41:41 -0500 Subject: [PATCH 07/11] crusher rename + 350 chr limit descs --- code/modules/mining/equipment/kinetic_crusher.dm | 1 + code/modules/paperwork/pen.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 8ede497c83..561dc9c096 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -19,6 +19,7 @@ attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped") sharpness = SHARP_EDGED actions_types = list(/datum/action/item_action/toggle_light) + obj_flags = UNIQUE_RENAME var/list/trophies = list() var/charged = TRUE var/charge_time = 15 diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 0ad49e192d..cb9570e02f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -173,7 +173,7 @@ O.renamedByPlayer = TRUE if(penchoice == "Change description") - var/input = stripped_input(user,"Describe [O] here:", ,"[O.desc]", 140) + var/input = stripped_input(user,"Describe [O] here:", ,"[O.desc]", 350) var/olddesc = O.desc if(QDELETED(O) || !user.canUseTopic(O, BE_CLOSE)) return From 043de3aabd17ef6dfa00949c94942086d7a96955 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Aug 2022 01:17:06 -0500 Subject: [PATCH 08/11] Automatic changelog generation for PR #15747 [ci skip] --- html/changelogs/AutoChangeLog-pr-15747.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15747.yml diff --git a/html/changelogs/AutoChangeLog-pr-15747.yml b/html/changelogs/AutoChangeLog-pr-15747.yml new file mode 100644 index 0000000000..5660fdb125 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15747.yml @@ -0,0 +1,4 @@ +author: "Linzolle" +delete-after: True +changes: + - bugfix: "catwalk overlays behave properly, appearing on top of cables and such" From 73ebb93a66d28b8ef2c75a6dd7bd74afe1e2cede Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Aug 2022 01:17:24 -0500 Subject: [PATCH 09/11] Automatic changelog generation for PR #15751 [ci skip] --- html/changelogs/AutoChangeLog-pr-15751.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15751.yml diff --git a/html/changelogs/AutoChangeLog-pr-15751.yml b/html/changelogs/AutoChangeLog-pr-15751.yml new file mode 100644 index 0000000000..f37748f5d0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15751.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "Recoil now pushes your screen in the opposite direction of where you're shooting. It makes sense in context, I swear. Adjust the setting for this in your client prefs, because it defaults to on." From ccc67a8f924663a18300a39cb2aa79c9984b79aa Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Aug 2022 01:17:31 -0500 Subject: [PATCH 10/11] Automatic changelog generation for PR #15753 [ci skip] --- html/changelogs/AutoChangeLog-pr-15753.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15753.yml diff --git a/html/changelogs/AutoChangeLog-pr-15753.yml b/html/changelogs/AutoChangeLog-pr-15753.yml new file mode 100644 index 0000000000..b7201a1f87 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15753.yml @@ -0,0 +1,5 @@ +author: "SandPoot" +delete-after: True +changes: + - bugfix: "Fixed the lack of eyes making ERROR appear on people." + - qol: "Set up for the dmi editor extension, very helpful as you can see the existant states and their names opposed to only images in a huge spritesheet." From 2b8e638e825b2d0fa9e34203feec10ae85ba9172 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Aug 2022 01:17:46 -0500 Subject: [PATCH 11/11] Automatic changelog generation for PR #15757 [ci skip] --- html/changelogs/AutoChangeLog-pr-15757.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-15757.yml diff --git a/html/changelogs/AutoChangeLog-pr-15757.yml b/html/changelogs/AutoChangeLog-pr-15757.yml new file mode 100644 index 0000000000..170f1d733d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15757.yml @@ -0,0 +1,5 @@ +author: "Hatterhat" +delete-after: True +changes: + - tweak: "Proto-kinetic crushers and variants can now be renamed via pen." + - tweak: "Custom descriptions on items tagged with UNIQUE_RENAME can now go to 350 characters, up from 140."