From 908718cdee099a979f2ccda91543c15c73d9dbed Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie <94908713+SomeGuyEatingPie@users.noreply.github.com> Date: Fri, 8 Apr 2022 14:56:07 +0100 Subject: [PATCH 1/5] Hitchikers Reference Edited the towel description. --- code/modules/reagents/reagent_containers/rags.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm index 27bf460e..015ac373 100644 --- a/code/modules/reagents/reagent_containers/rags.dm +++ b/code/modules/reagents/reagent_containers/rags.dm @@ -110,7 +110,7 @@ /obj/item/reagent_containers/rag/towel name = "towel" - desc = "A soft cotton towel." + desc = "Make sure you always know where it is." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "towel" item_state = "towel" From 059993820e24988b75a4494494cc7e222fc2848e Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Fri, 8 Apr 2022 15:06:30 +0100 Subject: [PATCH 2/5] Fallout Reference Flask: "You take a sip from your trusty GS13 canteen." --- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 5d61d851..add61506 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -384,7 +384,7 @@ /obj/item/reagent_containers/food/drinks/flask name = "flask" - desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." + desc = "You take a sip from your trusty GS13 canteen." icon_state = "flask" materials = list(MAT_METAL=250) volume = 60 From d0fc08dd7a27f14ae43726799dfa3986c5793974 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Fri, 8 Apr 2022 16:59:15 +0100 Subject: [PATCH 3/5] More Funnies --- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 1 + code/game/objects/items/tools/crowbar.dm | 3 ++- code/modules/clothing/head/misc.dm | 2 +- code/modules/photography/camera/camera.dm | 2 +- code/modules/vehicles/scooter.dm | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index bef5effb..206580f7 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -4,7 +4,7 @@ /obj/machinery/camera name = "security camera" - desc = "It's used to monitor rooms." + desc = "This is literally 1984." icon = 'icons/obj/machines/camera.dmi' icon_state = "camera" light_color = "#CDDDFF" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 7ee1519b..20473c38 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -387,6 +387,7 @@ /obj/machinery/door/airlock/vault name = "vault door" + desc= "Guys, the thermal drill. Go get it." icon = 'icons/obj/doors/airlocks/vault/vault.dmi' overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 74327fca..c0093e1b 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -28,6 +28,7 @@ /obj/item/crowbar/red icon_state = "crowbar_red" + desc = "I think you dropped this back in Black Mesa." force = 8 /obj/item/crowbar/brass @@ -101,4 +102,4 @@ icon = 'icons/obj/advancedtools.dmi' usesound = 'sound/weapons/sonic_jackhammer.ogg' icon_state = "crowbar" - toolspeed = 0.2 \ No newline at end of file + toolspeed = 0.2 diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index b0a95cac..8284208b 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -157,7 +157,7 @@ /obj/item/clothing/head/chicken name = "chicken suit head" - desc = "Bkaw!" + desc = "Do you like hurting other people?" icon_state = "chickenhead" item_state = "chickensuit" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index d1e86891..91c87cc9 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -4,7 +4,7 @@ /obj/item/camera name = "camera" icon = 'icons/obj/items_and_weapons.dmi' - desc = "A polaroid camera." + desc = "Snap, thats going on my cringe compilation. :)" icon_state = "camera" item_state = "camera" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index dfafc218..a5340519 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -42,7 +42,7 @@ /obj/vehicle/ridden/scooter/skateboard name = "skateboard" - desc = "An unfinished scooter which can only barely be called a skateboard. It's still rideable, but probably unsafe. Looks like you'll need to add a few rods to make handlebars. Alt-click to adjust speed." + desc = "He was a skater boy. She said, 'See you later, boy'. Alt-click to adjust speed." icon_state = "skateboard" density = FALSE var/adjusted_speed = FALSE From 3923f4b91e09a7c6705227683769cf795ecf07a3 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie <94908713+SomeGuyEatingPie@users.noreply.github.com> Date: Fri, 6 May 2022 12:42:24 +0100 Subject: [PATCH 4/5] Changeed Ahelp message When submitting an adminhelp without an admin present, the game tells players the message has been sent to the discord. Now the game tells players to submit their ahelp to the discord channel. --- code/modules/admin/verbs/adminhelp.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 269d96ec..4fee66aa 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -211,7 +211,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) - to_chat(C, "No active admins are online, your adminhelp was sent to the Discord.") + to_chat(C, "No active admins are online. **Please send your Adminhelp to the discord channel with an '@Admin'**.") //hyper change, because we have our own bot, the notification has to be loaded into a file, for the bot to read. fdel("Hyperbot/ahelp.txt") var botmsg = "**[initiator_key_name]** *([GLOB.round_id])*```[msg]```" From 136cd845b9779b747ee130a122d6b9057f6e8419 Mon Sep 17 00:00:00 2001 From: SomeGuyEatingPie Date: Fri, 6 May 2022 12:59:08 +0100 Subject: [PATCH 5/5] Corrected Funny reference branches --- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 1 - code/game/objects/items/tools/crowbar.dm | 1 - code/modules/clothing/head/misc.dm | 2 +- code/modules/food_and_drinks/drinks/drinks.dm | 2 +- code/modules/photography/camera/camera.dm | 2 +- code/modules/reagents/reagent_containers/rags.dm | 2 +- code/modules/vehicles/scooter.dm | 2 +- 8 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 206580f7..bef5effb 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -4,7 +4,7 @@ /obj/machinery/camera name = "security camera" - desc = "This is literally 1984." + desc = "It's used to monitor rooms." icon = 'icons/obj/machines/camera.dmi' icon_state = "camera" light_color = "#CDDDFF" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 20473c38..7ee1519b 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -387,7 +387,6 @@ /obj/machinery/door/airlock/vault name = "vault door" - desc= "Guys, the thermal drill. Go get it." icon = 'icons/obj/doors/airlocks/vault/vault.dmi' overlays_file = 'icons/obj/doors/airlocks/vault/overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_vault diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index c0093e1b..9aaf9767 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -28,7 +28,6 @@ /obj/item/crowbar/red icon_state = "crowbar_red" - desc = "I think you dropped this back in Black Mesa." force = 8 /obj/item/crowbar/brass diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8284208b..b0a95cac 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -157,7 +157,7 @@ /obj/item/clothing/head/chicken name = "chicken suit head" - desc = "Do you like hurting other people?" + desc = "Bkaw!" icon_state = "chickenhead" item_state = "chickensuit" flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index add61506..5d61d851 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -384,7 +384,7 @@ /obj/item/reagent_containers/food/drinks/flask name = "flask" - desc = "You take a sip from your trusty GS13 canteen." + desc = "Every good spaceman knows it's a good idea to bring along a couple of pints of whiskey wherever they go." icon_state = "flask" materials = list(MAT_METAL=250) volume = 60 diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 91c87cc9..d1e86891 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -4,7 +4,7 @@ /obj/item/camera name = "camera" icon = 'icons/obj/items_and_weapons.dmi' - desc = "Snap, thats going on my cringe compilation. :)" + desc = "A polaroid camera." icon_state = "camera" item_state = "camera" lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm index 015ac373..27bf460e 100644 --- a/code/modules/reagents/reagent_containers/rags.dm +++ b/code/modules/reagents/reagent_containers/rags.dm @@ -110,7 +110,7 @@ /obj/item/reagent_containers/rag/towel name = "towel" - desc = "Make sure you always know where it is." + desc = "A soft cotton towel." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "towel" item_state = "towel" diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index a5340519..dfafc218 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -42,7 +42,7 @@ /obj/vehicle/ridden/scooter/skateboard name = "skateboard" - desc = "He was a skater boy. She said, 'See you later, boy'. Alt-click to adjust speed." + desc = "An unfinished scooter which can only barely be called a skateboard. It's still rideable, but probably unsafe. Looks like you'll need to add a few rods to make handlebars. Alt-click to adjust speed." icon_state = "skateboard" density = FALSE var/adjusted_speed = FALSE