From de6c369d04585df3c94c43a96643acfa82858d4f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:35:25 -0500 Subject: [PATCH 01/15] fuck that shit --- code/game/objects/structures/flora.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7b01243290..f46373c84e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -706,15 +706,15 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. var/new_slowdown = H.next_move_slowdown + rand(4,7) H.next_move_slowdown = new_slowdown if(prob(10)) - to_chat(H, SPAN_WARNING("It is very hard to move trough this [src]...")) + to_chat(H, SPAN_WARNING("It is very hard to move through this [src]...")) if(8 to 9) var/new_slowdown = H.next_move_slowdown + rand(8,11) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got tangeled in [src]!")) + to_chat(H, SPAN_WARNING("You got tangled in [src]!")) if(10) var/new_slowdown = H.next_move_slowdown + rand(12,20) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got completely tangeled in [src]! Oh boy...")) + to_chat(H, SPAN_WARNING("You got completely tangled in [src]! Oh boy...")) /obj/structure/flora/jungle/thickbush/attackby(obj/item/I as obj, mob/user as mob) //hatchets and shiet can clear away undergrowth @@ -724,9 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it - to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here.")) + to_chat(user, SPAN_DANGER("You chop away at the undergrowth, but it's too thick here.")) else - user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I].")) + user.visible_message(SPAN_DANGER("[user] chops away at the [src] with [I]."),SPAN_DANGER("You chop away at the [src] with [I].")) playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1) health -= damage if(health < 0) From 8ea6f23b97f04f9a6a0471c8526085222c5868b5 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 11:45:08 -0500 Subject: [PATCH 02/15] emails --- code/datums/fluff_emails.dm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index f7083541dd..8a7ce922e2 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,6 +3,57 @@ var/title //email title var/entry_text //email content +//emails for the Golden Arrow. Implementation... soon? +/datum/fluff_email/golden_arrow + +/datum/fluff_email/golden_arrow/section_a + title = "Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + swear to god dude this is such bs. fuckin "enhanced readiness" my ass, + transfer someone over so we're not workin with half strength platoons out here! god! +
+
+ I can tell even the gunny ain't happy about this shit, the Lt's putting on a smile + but we all seen her and that friggin picture of her girlfriend she got in her wallet or whatever. + What happened to overtime pay? + + "} + +/datum/fluff_email/golden_arrow/section_a/reply1 + title = "RE: Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + [...] +
+
+ Okay, listen, yeah I know it's bullshit but we've got all their support gear to play with and + it's at least less fucked in the barracks if we overnight somewhere. Too many stinking bodies is + hell on earth, right? + Also. C'mon, dude. I know what you really want. You're looking at getting that bet money from Carmen + right? :) + + "} + +/datum/fluff_email/golden_arrow/section_a/reply2 + title = "RE: RE: Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + [...] +
+
+ [...] + we've got their support gear to play with but where'd all the ordinance go???? Lt says the + ammo supply for the M83A2s is fine, but 'new regulations' require him to store it under + the automated quartermaster's supervision??? if that's true, why're the M40s laying out?? +
+
+ also fuck you, i earned that shit. the spicy peanut milk fuckin sucked. + + "} //emails for the Almayer computers /datum/fluff_email/almayer From b69183dace5284882e8fde821494f9f90a72de40 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:40:54 -0500 Subject: [PATCH 03/15] FUCK. --- code/datums/fluff_emails.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index 8a7ce922e2..06b76ae6df 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -23,7 +23,7 @@ /datum/fluff_email/golden_arrow/section_a/reply1 title = "RE: Section A shore leave???" - entry_text = {" + entry_text = {" LOG//:WEBMASTER/RETRIEVE/EMAIL LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' [...] @@ -39,7 +39,7 @@ /datum/fluff_email/golden_arrow/section_a/reply2 title = "RE: RE: Section A shore leave???" - entry_text = {" + entry_text = {" LOG//:WEBMASTER/RETRIEVE/EMAIL LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' [...] From d5078fe5c8f707939cf93a5208d5582013b18490 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:41:44 -0500 Subject: [PATCH 04/15] unfucks that. --- code/datums/fluff_emails.dm | 52 ------------------------------------- 1 file changed, 52 deletions(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index 06b76ae6df..b57431cca9 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,58 +3,6 @@ var/title //email title var/entry_text //email content -//emails for the Golden Arrow. Implementation... soon? -/datum/fluff_email/golden_arrow - -/datum/fluff_email/golden_arrow/section_a - title = "Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - swear to god dude this is such bs. fuckin "enhanced readiness" my ass, - transfer someone over so we're not workin with half strength platoons out here! god! -
-
- I can tell even the gunny ain't happy about this shit, the Lt's putting on a smile - but we all seen her and that friggin picture of her girlfriend she got in her wallet or whatever. - What happened to overtime pay? - - "} - -/datum/fluff_email/golden_arrow/section_a/reply1 - title = "RE: Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - [...] -
-
- Okay, listen, yeah I know it's bullshit but we've got all their support gear to play with and - it's at least less fucked in the barracks if we overnight somewhere. Too many stinking bodies is - hell on earth, right? - Also. C'mon, dude. I know what you really want. You're looking at getting that bet money from Carmen - right? :) - - "} - -/datum/fluff_email/golden_arrow/section_a/reply2 - title = "RE: RE: Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - [...] -
-
- [...] - we've got their support gear to play with but where'd all the ordinance go???? Lt says the - ammo supply for the M83A2s is fine, but 'new regulations' require him to store it under - the automated quartermaster's supervision??? if that's true, why're the M40s laying out?? -
-
- also fuck you, i earned that shit. the spicy peanut milk fuckin sucked. - - "} - //emails for the Almayer computers /datum/fluff_email/almayer From edf2edec75b65798b85c231957d7bb56fe766f79 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:55:01 -0500 Subject: [PATCH 05/15] try to fix the problem --- code/game/objects/structures/flora.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0148349f47..3461b9049e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -724,15 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it -<<<<<<< HEAD - to_chat(user, SPAN_DANGER("You chop away at the undergrowth, but it's too thick here.")) - else - user.visible_message(SPAN_DANGER("[user] chops away at the [src] with [I]."),SPAN_DANGER("You chop away at the [src] with [I].")) -======= to_chat(user, SPAN_DANGER("You chop at the undergrowth, but it's too thick here.")) else user.visible_message(SPAN_DANGER("[user] chops at the [src] with [I]."),SPAN_DANGER("You chop at the [src] with [I].")) ->>>>>>> 48aca9e1b50768a553d2ee81fac139b060e7d0d0 playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1) health -= damage if(health < 0) From a361ab21dd886c311b32b8c4f8aad89f59352d5b Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 14:36:27 -0500 Subject: [PATCH 06/15] i dont know why hpefully fixed???? --- code/datums/fluff_emails.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index b57431cca9..a71ad083bb 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -6,7 +6,6 @@ //emails for the Almayer computers /datum/fluff_email/almayer - /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 0f713b93032bc81ada7cfbef0d073998d9798312 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 14:37:51 -0500 Subject: [PATCH 07/15] hopefully fixed wait no this needs to mathc --- code/datums/fluff_emails.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index a71ad083bb..b57431cca9 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -6,6 +6,7 @@ //emails for the Almayer computers /datum/fluff_email/almayer + /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 115e852fbb1233e9e322c198b926cc46163443ad Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 14:55:32 -0500 Subject: [PATCH 08/15] done --- code/modules/defenses/sentry_computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index 906473056e..d7afd52fc6 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -2,8 +2,8 @@ * Sentry gun computer which links to defensive structures. */ /obj/item/device/sentry_computer - name = "\improper Sentry Gun Network Laptop" - desc = "A laptop loaded with sentry control software." + name = "\improper AN/PSQ-55 Remote Weapons Console" + desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries." icon = 'icons/obj/structures/props/sentrycomp.dmi' icon_state = "sentrycomp_cl" w_class = SIZE_SMALL From f0b4d03a55c91a7f0cd30344f68c29a4e7cd48cd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 19 Jun 2024 20:13:03 -0500 Subject: [PATCH 09/15] fucking fix you piece of shit --- code/datums/fluff_emails.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index b57431cca9..a71ad083bb 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -6,7 +6,6 @@ //emails for the Almayer computers /datum/fluff_email/almayer - /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 017baf34ea76b0c17566e638a0087d9e7d6ca0bd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 00:27:34 -0500 Subject: [PATCH 10/15] undoes a fuckup with the master --- code/datums/fluff_emails.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index a71ad083bb..f7083541dd 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,9 +3,11 @@ var/title //email title var/entry_text //email content + //emails for the Almayer computers /datum/fluff_email/almayer + /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 25c68f9f478d0b5b4ccf60fbf0381450e53ec252 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 01:56:06 -0500 Subject: [PATCH 11/15] mk2 dies --- code/game/objects/prop.dm | 2 +- code/modules/projectiles/guns/rifles.dm | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index ac94e8ab03..c0a8dab00c 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -286,7 +286,7 @@ /obj/item/prop/magazine/boots/n054 name = "Boots!: Issue No.54" - desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'" + desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41AE1 self cleaning case'" /obj/item/prop/magazine/boots/n055 name = "Boots!: Issue No.55" diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 48918ef2ee..2b2be78e10 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -36,8 +36,8 @@ //M41A PULSE RIFLE /obj/item/weapon/gun/rifle/m41a - name = "\improper M41A pulse rifle MK2" - desc = "The standard issue rifle of the Colonial Marines. Commonly carried by most combat personnel. Uses 10x24mm caseless ammunition." + name = "\improper M41AE1 pulse rifle" + desc = "A modification of the M41A in limited trials, the M41AE1 improves handling and flexibility with increased modification support, while improving reliability by eliminating the legacy U-type magazine for a more traditional design." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m41a" item_state = "m41a" @@ -112,7 +112,7 @@ /obj/item/weapon/gun/rifle/nsg23 name = "\improper NSG 23 assault rifle" - desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close." + desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close." icon = 'icons/obj/items/weapons/guns/guns_by_faction/wy.dmi' icon_state = "nsg23" item_state = "nsg23" @@ -200,7 +200,7 @@ /obj/item/weapon/gun/rifle/m41a/elite name = "\improper M41A/2 pulse rifle" - desc = "A modified version M41A Pulse Rifle MK2, re-engineered for better weight, handling and accuracy. Fires precise two-round bursts. Given only to elite units." + desc = "A modified version M41AE1 Pulse Rifle, re-engineered for better weight, handling and accuracy. Fires precise two-round bursts. Given only to elite units." icon_state = "m41a2" item_state = "m41a2" @@ -249,7 +249,7 @@ starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/magnetic_harness, /obj/item/attachable/angledgrip, /obj/item/attachable/suppressor) /obj/item/weapon/gun/rifle/m41a/corporate - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition." + desc = "A Weyland-Yutani creation, this M41AE1 comes equipped in corporate white. Uses 10x24mm caseless ammunition." icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi' item_icons = list( WEAR_L_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi', @@ -262,7 +262,7 @@ starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible) /obj/item/weapon/gun/rifle/m41a/corporate/no_lock //for PMC nightmares. - desc = "A Weyland-Yutani creation, this M41A MK2 comes equipped in corporate white. Uses 10x24mm caseless ammunition. This one had its IFF electronics removed." + desc = "A Weyland-Yutani creation, this M41AE1 comes equipped in corporate white. Uses 10x24mm caseless ammunition. This one had its IFF electronics removed." flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER /obj/item/weapon/gun/rifle/m41a/corporate/detainer //for chem ert @@ -286,7 +286,7 @@ /obj/item/weapon/gun/rifle/m41a/elite/xm40 name = "\improper XM40 pulse rifle" - desc = "One of the experimental predecessors to the M41 line that never saw widespread adoption beyond elite marine units. Of the rifles in the USCM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41A MK2 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode." + desc = "One of the experimental predecessors to the M41A line that never saw widespread adoption beyond elite marine units. Of the rifles in the USCM inventory that are still in production, this is the only one to feature an integrated suppressor. It can accept M41AE1 magazines, but also features its own proprietary magazine system. Extremely lethal in burstfire mode." icon_state = "m40sd" item_state = "m40sd" reload_sound = 'sound/weapons/handling/m40sd_reload.ogg' @@ -418,12 +418,12 @@ current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition." + desc = "A classic M41A Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/shotgun) current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap /obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." + desc = "A classic M41A Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1) /obj/item/weapon/gun/rifle/m41aMK1/forecon @@ -441,7 +441,7 @@ /obj/item/weapon/gun/rifle/m46c name = "\improper M46C pulse rifle" - desc = "A prototype M46C, an experimental rifle platform built to outperform the standard M41A. Back issue only. Uses standard MK1 & MK2 rifle magazines." + desc = "A prototype M46C, an experimental rifle platform built to outperform the standard M41A. Back issue only. Can feed from the standard magazines as well as the short M41AE1 mags." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m46c" item_state = "m46c" From 5fe31ab55b33fa92078b0f0b49868aba9e557196 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:02:23 -0500 Subject: [PATCH 12/15] super die and one bugfix --- code/modules/gear_presets/cbrn.dm | 2 +- code/modules/projectiles/ammo_boxes/ammo_boxes.dm | 2 +- code/modules/projectiles/ammo_boxes/round_boxes.dm | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/gear_presets/cbrn.dm b/code/modules/gear_presets/cbrn.dm index 98a6b0665e..2b46c7c447 100644 --- a/code/modules/gear_presets/cbrn.dm +++ b/code/modules/gear_presets/cbrn.dm @@ -55,7 +55,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41amk1/ap(new_human), WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/device/analyzer(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/reagent_scanner(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/prop/geiger_counter(new_human), WEAR_IN_BACK) diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index 91c11b242a..d9d9c88e89 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -257,7 +257,7 @@ /obj/item/ammo_box/rounds name = "\improper rifle ammunition box (10x24mm)" - desc = "A 10x24mm ammunition box. Used to refill M41A MK1, MK2, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back." + desc = "A 10x24mm ammunition box. Used to refill M41A MK1, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back." icon_state = "base_m41" item_state = "base_m41" flags_equip_slot = SLOT_BACK diff --git a/code/modules/projectiles/ammo_boxes/round_boxes.dm b/code/modules/projectiles/ammo_boxes/round_boxes.dm index 146f576b59..c196730974 100644 --- a/code/modules/projectiles/ammo_boxes/round_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/round_boxes.dm @@ -4,7 +4,7 @@ /obj/item/ammo_box/rounds/ap name = "\improper rifle ammunition box (10x24mm AP)" - desc = "A 10x24mm armor-piercing ammunition box. Used to refill M41A MK2, and M4RA AP magazines. It comes with a leather strap allowing to wear it on the back." + desc = "A 10x24mm armor-piercing ammunition box. Used to refill M41A and M4RA AP magazines. It comes with a leather strap allowing to wear it on the back." overlay_content = "_ap" default_ammo = /datum/ammo/bullet/rifle/ap @@ -13,7 +13,7 @@ /obj/item/ammo_box/rounds/le name = "\improper rifle ammunition box (10x24mm LE)" - desc = "A 10x24mm armor-shredding ammunition box. Used to refill M41A MK2 LE magazines. It comes with a leather strap allowing to wear it on the back." + desc = "A 10x24mm armor-shredding ammunition box. Used to refill M41A LE magazines. It comes with a leather strap allowing to wear it on the back." overlay_content = "_le" default_ammo = /datum/ammo/bullet/rifle/le @@ -22,7 +22,7 @@ /obj/item/ammo_box/rounds/incen name = "\improper rifle ammunition box (10x24mm Incen)" - desc = "A 10x24mm incendiary ammunition box. Used to refill M41A MK2 and M4RA incendiary magazines. It comes with a leather strap allowing to wear it on the back." + desc = "A 10x24mm incendiary ammunition box. Used to refill M41A and M4RA incendiary magazines. It comes with a leather strap allowing to wear it on the back." overlay_content = "_incen" default_ammo = /datum/ammo/bullet/rifle/incendiary bullet_amount = 400 //Incen is OP From 1b4c590a16e920da27510cd94a6b5f725145b8fb Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:04:41 -0500 Subject: [PATCH 13/15] weird bug fix --- code/modules/defenses/sentry_computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index d7afd52fc6..906473056e 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -2,8 +2,8 @@ * Sentry gun computer which links to defensive structures. */ /obj/item/device/sentry_computer - name = "\improper AN/PSQ-55 Remote Weapons Console" - desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries." + name = "\improper Sentry Gun Network Laptop" + desc = "A laptop loaded with sentry control software." icon = 'icons/obj/structures/props/sentrycomp.dmi' icon_state = "sentrycomp_cl" w_class = SIZE_SMALL From dfa3a81e92ee1f4beb9090878d63921f70c6557a Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:32:03 -0500 Subject: [PATCH 14/15] hopefully fixes weird error --- code/modules/gear_presets/cbrn.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/gear_presets/cbrn.dm b/code/modules/gear_presets/cbrn.dm index 2b46c7c447..158d83bf40 100644 --- a/code/modules/gear_presets/cbrn.dm +++ b/code/modules/gear_presets/cbrn.dm @@ -55,7 +55,7 @@ new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_J_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41amk1(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41amk1/ap(new_human), WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1/ap(new_human), WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/device/analyzer(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/reagent_scanner(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/prop/geiger_counter(new_human), WEAR_IN_BACK) From b09f26a5e585709cf2399766019b977e31650b84 Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Mon, 24 Jun 2024 01:23:14 -0500 Subject: [PATCH 15/15] Update code/modules/projectiles/ammo_boxes/ammo_boxes.dm whoopsie Co-authored-by: private-tristan <54422837+private-tristan@users.noreply.github.com> --- code/modules/projectiles/ammo_boxes/ammo_boxes.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm index d9d9c88e89..f68e307f6c 100644 --- a/code/modules/projectiles/ammo_boxes/ammo_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/ammo_boxes.dm @@ -257,7 +257,7 @@ /obj/item/ammo_box/rounds name = "\improper rifle ammunition box (10x24mm)" - desc = "A 10x24mm ammunition box. Used to refill M41A MK1, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back." + desc = "A 10x24mm ammunition box. Used to refill M41A, M4RA and M41AE2 HPR magazines. It comes with a leather strap allowing to wear it on the back." icon_state = "base_m41" item_state = "base_m41" flags_equip_slot = SLOT_BACK