From bf5d94fc6122014b2fb20761651a803069f921db Mon Sep 17 00:00:00 2001 From: Stalkeros <42087567+Stalkeros2@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:39:13 +0500 Subject: [PATCH 01/14] Ancient Milsim (very late) Anniversary Update (#4704) * tbd * Update anchor.dm * more stuff * even more stuff * Update choice_beacon.dm * almost forgot * Stuff for runners to barricade themselves with * Update choice_beacon.dm * i forgot to push stuff again * Update disks.dm * Apply suggestions from code review Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update disks.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- _maps/virtual_domains/ancientmilsim_nova.dmm | 20 +- .../modules/bitrunning/code/anchor.dm | 34 +++ modular_nova/modules/bitrunning/code/disks.dm | 34 ++- .../ancient_milsim/choice_beacon.dm | 58 +++-- .../virtual_domains/ancient_milsim/mod.dm | 207 +++++++++++++----- .../ancient_milsim/mounted_machine_gun.dm | 40 ++++ .../ancient_milsim/virtual_domain.dm | 11 +- .../syndicate_assault/ghost_spawner.dm | 41 +++- .../modules/bitrunning/icons/remote.dmi | Bin 0 -> 1906 bytes tgstation.dme | 2 + 10 files changed, 348 insertions(+), 99 deletions(-) create mode 100644 modular_nova/modules/bitrunning/code/anchor.dm create mode 100644 modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mounted_machine_gun.dm create mode 100644 modular_nova/modules/bitrunning/icons/remote.dmi diff --git a/_maps/virtual_domains/ancientmilsim_nova.dmm b/_maps/virtual_domains/ancientmilsim_nova.dmm index b262430eddfd..eaaa5b13d10f 100644 --- a/_maps/virtual_domains/ancientmilsim_nova.dmm +++ b/_maps/virtual_domains/ancientmilsim_nova.dmm @@ -102,6 +102,10 @@ /obj/effect/landmark/bitrunning/curiosity_spawn, /turf/open/floor/grass/fairy, /area/virtual_domain/protected_space/ancient_milsim) +"ds" = ( +/obj/item/stack/sheet/mineral/sandbags/fifty, +/turf/open/misc/grass/planet/ancient_milsim, +/area/virtual_domain/ancient_milsim/loot_camp) "dB" = ( /obj/effect/landmark/bitrunning/curiosity_spawn, /turf/open/misc/dirt/planet, @@ -494,6 +498,9 @@ /obj/item/ammo_box/magazine/c35sol_pistol/stendo, /obj/item/ammo_box/magazine/c35sol_pistol/stendo, /obj/item/ammo_box/magazine/lanca, +/obj/item/minespawner/ancient_milsim, +/obj/item/minespawner/ancient_milsim, +/obj/item/minespawner/ancient_milsim, /turf/open/floor/iron/dark, /area/virtual_domain/ancient_milsim/loot_camp) "ob" = ( @@ -510,6 +517,7 @@ /turf/open/floor/plating, /area/virtual_domain/ancient_milsim/maintenance) "ol" = ( +/obj/item/automatic_turret_folded, /turf/open/floor/iron/dark, /area/virtual_domain/ancient_milsim/carrier) "or" = ( @@ -1078,6 +1086,10 @@ /obj/item/storage/medkit/frontier/stocked, /turf/open/floor/iron/white, /area/virtual_domain/ancient_milsim/medbay) +"Cj" = ( +/obj/item/storage/barricade, +/turf/open/floor/iron/dark, +/area/virtual_domain/ancient_milsim/loot_camp) "Cr" = ( /obj/structure/chair/office/light{ dir = 4 @@ -1531,6 +1543,7 @@ /area/virtual_domain/ancient_milsim/carrier) "My" = ( /obj/structure/table, +/obj/item/storage/barricade, /turf/open/floor/iron/dark, /area/virtual_domain/ancient_milsim/loot_camp) "Mz" = ( @@ -1743,6 +1756,9 @@ /obj/item/ammo_box/magazine/c35sol_pistol/stendo, /obj/item/ammo_box/magazine/c35sol_pistol/stendo, /obj/item/stock_parts/matter_bin/super, +/obj/item/minespawner/ancient_milsim, +/obj/item/minespawner/ancient_milsim, +/obj/item/minespawner/ancient_milsim, /turf/open/floor/iron/dark, /area/virtual_domain/ancient_milsim/loot_camp) "RC" = ( @@ -4183,7 +4199,7 @@ Uz "} (38,1,1) = {" Uz -Vl +ds Vl Vl TG @@ -4360,7 +4376,7 @@ Uz TQ bB bB -ki +Cj vQ ki Ww diff --git a/modular_nova/modules/bitrunning/code/anchor.dm b/modular_nova/modules/bitrunning/code/anchor.dm new file mode 100644 index 000000000000..26be4338f49b --- /dev/null +++ b/modular_nova/modules/bitrunning/code/anchor.dm @@ -0,0 +1,34 @@ +/obj/item/domain_anchor + name = "domain connection anchor" + desc = "A disposable tablet with a set of programs and utilities meant to stabilize the local square meter of domain infospace for new connections to be hopefully-safe.
\ + In layman's terms, this creates additional bitrunning spawn points." + icon = 'modular_nova/modules/bitrunning/icons/remote.dmi' + icon_state = "delivery_running" + +/obj/item/domain_anchor/examine(mob/user) + . = ..() + . += span_notice("Use in-hand to create a new spawn point.") + +/obj/item/domain_anchor/attack_self(mob/user, modifiers) + for(var/obj/machinery/quantum_server/server in SSmachines.get_machines_by_type(/obj/machinery/quantum_server)) + server.exit_turfs += get_turf(src) + server.retries_spent -= 1 + server.threat += 1 + server.radio.talk_into(src, "Potential secure datastream detected. Locking on the new spawn point.", RADIO_CHANNEL_SUPPLY) + new /obj/effect/landmark/bitrunning/domain_anchor(drop_location()) + user.balloon_alert(user, "connection stabilized!") + qdel(src) + +/obj/effect/landmark/bitrunning/domain_anchor + name = "anchored secure connection" + desc = "Highly stable connection protocol, and consequentially a trojan, used by bitrunners during attacks on high-value targets when numbers are key and \ + just three attempts aren't enough.
\ + In several seconds it will merge itself with the code, becoming nigh-invisible to any means of detection." + icon = 'icons/effects/effects.dmi' + icon_state = "curse" + invisibility = INVISIBILITY_NONE + +/obj/effect/landmark/bitrunning/domain_anchor/Initialize(mapload) + . = ..() + animate(src, alpha = 0, 10 SECONDS) + QDEL_IN(src, 10 SECONDS) diff --git a/modular_nova/modules/bitrunning/code/disks.dm b/modular_nova/modules/bitrunning/code/disks.dm index c0f7b3709408..74e597b21c03 100644 --- a/modular_nova/modules/bitrunning/code/disks.dm +++ b/modular_nova/modules/bitrunning/code/disks.dm @@ -7,6 +7,7 @@ /datum/action/cooldown/spell/shapeshift/minor_illusion, /datum/action/cooldown/spell/conjure_item/fire, /datum/action/cooldown/spell/conjure_item/water, + /datum/action/cooldown/spell/conjure/cheese, ) /obj/item/bitrunning_disk/item/tier0 @@ -70,7 +71,7 @@ /datum/orderable_item/bitrunning_tech/ability_tier0 cost_per_order = 350 purchase_path = /obj/item/bitrunning_disk/ability/tier0 - desc = "This disk contains a program that lets you cast Minor Illusion, Conjure Presents!, Produce Flame, or Produce Water." + desc = "This disk contains a program that lets you cast Minor Illusion, Summon Cheese, Produce Flame, or Produce Water." /datum/orderable_item/bitrunning_tech/item_tier0 cost_per_order = 350 @@ -82,6 +83,7 @@ selectable_items = list( /obj/item/summon_beacon/lustwish, /obj/item/storage/box/nif_ghost_box, + /obj/item/storage/box/syndie_kit/chameleon/ghostcafe, ) /obj/item/summon_beacon/lustwish @@ -112,12 +114,13 @@ /datum/orderable_item/bitrunning_tech/item_tierlewd cost_per_order = 250 purchase_path = /obj/item/bitrunning_disk/item/tierlewd - desc = "This disk contains a program that lets you equip a LustWish vending machine delivery beacon or a quick-booting NIF package." + desc = "This disk contains a program that lets you equip a LustWish vending machine delivery beacon, a quick-booting NIF package or a set of chameleon clothing." /obj/item/bitrunning_disk/item/tier1/Initialize(mapload) . = ..() selectable_items += list( /obj/item/storage/belt/military, + /obj/item/book_of_babel, ) /obj/item/bitrunning_disk/item/tier2/Initialize(mapload) @@ -127,30 +130,41 @@ ) selectable_items += list( /obj/item/storage/toolbox/guncase/clandestine, - /obj/item/autosurgeon/syndicate/hackerman, + /obj/item/autosurgeon/syndicate/hackerman/bitrunning, /obj/item/clothing/head/helmet, /obj/item/melee/energy/sword/saber/blue, + /obj/item/shield/energy, /obj/item/storage/medkit/expeditionary/surplus, ) +/obj/item/autosurgeon/syndicate/hackerman/bitrunning + name = "hacking arm implanter" + /obj/item/bitrunning_disk/item/tier3/Initialize(mapload) . = ..() selectable_items -= list( /obj/item/gun/energy/e_gun/nuclear, ) selectable_items += list( - /obj/item/autosurgeon/syndicate/nodrop, + /obj/item/domain_anchor, + /obj/item/autosurgeon/syndicate/nodrop/bitrunning, /obj/item/gun/energy/modular_laser_rifle, /obj/item/storage/belt/holster/energy/nanite, /obj/item/minigunpack, ) +/obj/item/autosurgeon/syndicate/nodrop/bitrunning + name = "anti-drop implanter" + /obj/item/bitrunning_disk/ability/tier1/Initialize(mapload) . = ..() selectable_actions += list( /datum/action/cooldown/spell/touch/lay_on_hands, /datum/action/cooldown/spell/conjure/flare, ) + selectable_actions -= list( + /datum/action/cooldown/spell/conjure/cheese, + ) /obj/item/bitrunning_disk/ability/tier2/Initialize(mapload) . = ..() @@ -158,9 +172,13 @@ /datum/action/cooldown/adrenaline, /datum/action/cooldown/spell/charge, /datum/action/cooldown/mob_cooldown/dash, - /datum/action/cooldown/spell/touch/scream_for_me, + /datum/action/cooldown/spell/touch/scream_for_me/bitrunning, ) +/datum/action/cooldown/spell/touch/scream_for_me/bitrunning + name = "Unshackled Scream For Me" + spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC + /obj/item/bitrunning_disk/ability/tier3/Initialize(mapload) . = ..() selectable_actions += list( @@ -185,13 +203,13 @@ desc = "This disk contains a program that lets you equip a luxury medipen, a pistol case, an armour vest, a helmet, an energy sword, an expeditionary medkit, or a hacker implant." /datum/orderable_item/bitrunning_tech/item_tier3 - desc = "This disk contains a program that lets you equip a Hyeseong laser rifle, a laser minigun pack, a nanite pistol holster, a dual bladed energy sword, a minibomb, or an anti-drop implanter." + desc = "This disk contains a program that lets you equip a domain connection anchor, Hyeseong laser rifle, a laser minigun pack, a nanite pistol holster, a dual bladed energy sword, a minibomb, or an anti-drop implanter." /datum/orderable_item/bitrunning_tech/ability_tier1 - desc = "This disk contains a program that lets you cast Summon Cheese, Summon Light Source, Lesser Heal, or Mending Touch." + desc = "This disk contains a program that lets you cast Summon Light Source, Lesser Heal, or Mending Touch." /datum/orderable_item/bitrunning_tech/ability_tier2 - desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, Scream For Me, Forcewall, Adrenaline Rush, Dash, or Charge Item." + desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, Unshackled Scream For Me, Forcewall, Adrenaline Rush, Dash, or Charge Item." /datum/orderable_item/bitrunning_tech/ability_tier3 desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, a polar bear, a holy juggernaut, or a holy wraith; or cast Death Loop." diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm index ab9b051b4e51..a318137dc25c 100644 --- a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm +++ b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm @@ -1,6 +1,8 @@ /obj/item/choice_beacon/ancient_milsim name = "early access equipment beacon" desc = "Summon a gear closet for your contributions in the early access testing. Synchronises with the current game version to give you the most up-to-date class equipment." + icon = 'modular_nova/modules/bitrunning/icons/remote.dmi' + icon_state = "delivery_dlc" company_source = "'Time Of Valor 2' development team" company_message = span_bold("Thanks, and have fun!") @@ -12,41 +14,65 @@ gear_options[initial(crate.name)] = crate return gear_options +/obj/structure/closet/crate/secure/weapon/milsim + desc = "(ToV 2 Playtester Reward) UNIF Counter-Insurgency Detachment bundle: featuring equipment provided to field operators in medium-intensity firefights.
\ + 'VCIM (Void Combat Identification Measures) camo' Skin (Alt 1/Strobeless, Opaque Glass)." + +/obj/structure/closet/crate/secure/weapon/milsim/PopulateContents() + . = ..() + new /obj/item/knife/combat(src) + new /obj/item/gun/energy/modular_laser_rifle/carbine(src) + new /obj/item/radio/headset/headset_faction(src) + /obj/structure/closet/crate/secure/weapon/milsim/after_open() qdel(src) /obj/structure/closet/crate/secure/weapon/milsim/mechanic - name = "mechanic loadout crate" + name = "mechanic (abductor toolbelt/cable coil dispenser/medHUD)" /obj/structure/closet/crate/secure/weapon/milsim/mechanic/PopulateContents() . = ..() - new /obj/item/knife/combat(src) - new /obj/item/gun/energy/modular_laser_rifle/carbine(src) - new /obj/item/mod/control/pre_equipped/responsory/milsim_mechanic(src) + new /obj/item/mod/control/pre_equipped/responsory/milsim/mechanic(src) /obj/structure/closet/crate/secure/weapon/milsim/marksman - name = "marksman loadout crate" + name = "marksman (barricade box/throwing knife dispenser/NVG-sonar)" /obj/structure/closet/crate/secure/weapon/milsim/marksman/PopulateContents() . = ..() - new /obj/item/knife/combat(src) - new /obj/item/gun/energy/modular_laser_rifle/carbine(src) - new /obj/item/mod/control/pre_equipped/responsory/milsim_marksman(src) + new /obj/item/mod/control/pre_equipped/responsory/milsim/marksman(src) /obj/structure/closet/crate/secure/weapon/milsim/medic - name = "medic loadout crate" + name = "medic (combat hypospray/combat hypovials dispenser/medHUD)" /obj/structure/closet/crate/secure/weapon/milsim/medic/PopulateContents() . = ..() - new /obj/item/knife/combat(src) - new /obj/item/gun/energy/modular_laser_rifle/carbine(src) - new /obj/item/mod/control/pre_equipped/responsory/milsim_medic(src) + new /obj/item/mod/control/pre_equipped/responsory/milsim/medic(src) /obj/structure/closet/crate/secure/weapon/milsim/trapper - name = "trapper loadout crate" + name = "trapper (chameleon projector/stealth landmine dispenser/thermals)" /obj/structure/closet/crate/secure/weapon/milsim/trapper/PopulateContents() . = ..() - new /obj/item/knife/combat(src) - new /obj/item/gun/energy/modular_laser_rifle/carbine(src) - new /obj/item/mod/control/pre_equipped/responsory/milsim_trapper(src) + new /obj/item/mod/control/pre_equipped/responsory/milsim/trapper(src) + +/obj/structure/closet/crate/secure/weapon/milsim/saboteur + name = "saboteur (Binyat implanter/EMP grenade dispenser/material scanner-mesons)" + +/obj/structure/closet/crate/secure/weapon/milsim/saboteur/PopulateContents() + . = ..() + new /obj/item/clothing/glasses/material(src) + new /obj/item/mod/control/pre_equipped/responsory/milsim/saboteur(src) + +/obj/structure/closet/crate/secure/weapon/milsim/sentinel + name = "sentinel (heavy machinegun/burger dispenser/NVG-sonar)" + +/obj/structure/closet/crate/secure/weapon/milsim/sentinel/PopulateContents() + . = ..() + new /obj/item/mod/control/pre_equipped/responsory/milsim/sentinel(src) + +/obj/structure/closet/crate/secure/weapon/milsim/trooper + name = "trooper (Sol rifle/Sol rifle magazine dispenser/NVG-sonar)" + +/obj/structure/closet/crate/secure/weapon/milsim/trooper/PopulateContents() + . = ..() + new /obj/item/mod/control/pre_equipped/responsory/milsim/trooper(src) diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm index 8cda78124450..2cbace5a1536 100644 --- a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm +++ b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mod.dm @@ -1,30 +1,28 @@ /datum/mod_theme/responsory/ancient_milsim armor_type = /datum/armor/armor_sf_hardened -/obj/item/mod/control/pre_equipped/responsory/milsim_mechanic +/obj/item/mod/control/pre_equipped/responsory/milsim theme = /datum/mod_theme/responsory/ancient_milsim applied_cell = /obj/item/stock_parts/power_store/cell/super starting_frequency = MODLINK_FREQ_NANOTRASEN req_access = null + +/obj/item/mod/control/pre_equipped/responsory/milsim/mechanic applied_modules = list( /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/magnetic_harness, /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/jetpack, - /obj/item/mod/module/visor/meson, + /obj/item/mod/module/visor/medhud, ) default_pins = list( /obj/item/mod/module/jetpack, - /obj/item/mod/module/visor/meson, + /obj/item/mod/module/visor/medhud, ) - insignia_type = /obj/item/mod/module/insignia/engineer - additional_module = /obj/item/mod/module/dispenser/emp + insignia_type = /obj/item/mod/module/insignia/milsim_mechanic + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/mechanic -/obj/item/mod/control/pre_equipped/responsory/milsim_trapper - theme = /datum/mod_theme/responsory/ancient_milsim - applied_cell = /obj/item/stock_parts/power_store/cell/super - starting_frequency = MODLINK_FREQ_NANOTRASEN - req_access = null +/obj/item/mod/control/pre_equipped/responsory/milsim/trapper applied_modules = list( /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/magnetic_harness, @@ -36,14 +34,10 @@ /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/thermal, ) - insignia_type = /obj/item/mod/module/insignia/commander - additional_module = /obj/item/mod/module/dispenser/landmine + insignia_type = /obj/item/mod/module/insignia/milsim_trapper + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/trapper -/obj/item/mod/control/pre_equipped/responsory/milsim_marksman - theme = /datum/mod_theme/responsory/ancient_milsim - applied_cell = /obj/item/stock_parts/power_store/cell/super - starting_frequency = MODLINK_FREQ_NANOTRASEN - req_access = null +/obj/item/mod/control/pre_equipped/responsory/milsim/marksman applied_modules = list( /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/magnetic_harness, @@ -57,14 +51,10 @@ /obj/item/mod/module/active_sonar, /obj/item/mod/module/visor/night, ) - insignia_type = /obj/item/mod/module/insignia/security - additional_module = /obj/item/mod/module/dispenser/throwing_knife + insignia_type = /obj/item/mod/module/insignia/milsim_marksman + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/marksman -/obj/item/mod/control/pre_equipped/responsory/milsim_medic - theme = /datum/mod_theme/responsory/ancient_milsim - applied_cell = /obj/item/stock_parts/power_store/cell/super - starting_frequency = MODLINK_FREQ_NANOTRASEN - req_access = null +/obj/item/mod/control/pre_equipped/responsory/milsim/medic applied_modules = list( /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/magnetic_harness, @@ -76,52 +66,104 @@ /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/medhud, ) - insignia_type = /obj/item/mod/module/insignia/medic - additional_module = /obj/item/mod/module/dispenser/hypospray + insignia_type = /obj/item/mod/module/insignia/milsim_medic + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/medic -/obj/item/mod/module/dispenser/emp - name = "MOD EMP grenade dispenser module" - desc = "This module can create activated EMP grenades at the user's liking." - removable = FALSE - dispense_type = /obj/item/grenade/empgrenade +/obj/item/mod/control/pre_equipped/responsory/milsim/saboteur + applied_modules = list( + /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/status_readout/operational, + /obj/item/mod/module/jetpack, + /obj/item/mod/module/visor/meson, + ) + default_pins = list( + /obj/item/mod/module/jetpack, + /obj/item/mod/module/visor/meson, + ) + insignia_type = /obj/item/mod/module/insignia/milsim_saboteur + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/saboteur -/obj/item/mod/module/dispenser/emp/on_use() - . = ..() - if(!.) - return - var/obj/item/grenade/empgrenade/grenade = . - grenade.arm_grenade(mod.wearer) - -/obj/item/mod/module/dispenser/landmine - name = "MOD landmine dispenser module" - desc = "This module can create deactivated landmines at the user's liking." - removable = FALSE - cooldown_time = 10 SECONDS - dispense_type = /obj/item/minespawner/ancient_milsim +/obj/item/mod/control/pre_equipped/responsory/milsim/sentinel + applied_modules = list( + /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/status_readout/operational, + /obj/item/mod/module/jetpack, + /obj/item/mod/module/active_sonar, + /obj/item/mod/module/visor/night, + ) + default_pins = list( + /obj/item/mod/module/jetpack, + /obj/item/mod/module/active_sonar, + /obj/item/mod/module/visor/night, + ) + insignia_type = /obj/item/mod/module/insignia/milsim_sentinel + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/sentinel -/obj/item/mod/module/dispenser/throwing_knife - name = "MOD throwing knife dispenser module" - desc = "This module can create throwing knives at the user's liking." - removable = FALSE - cooldown_time = 5 SECONDS - dispense_type = /obj/item/knife/combat/throwing +/obj/item/mod/control/pre_equipped/responsory/milsim/trooper + applied_modules = list( + /obj/item/mod/module/storage/large_capacity, + /obj/item/mod/module/magnetic_harness, + /obj/item/mod/module/status_readout/operational, + /obj/item/mod/module/jetpack, + /obj/item/mod/module/active_sonar, + /obj/item/mod/module/visor/night, + ) + default_pins = list( + /obj/item/mod/module/jetpack, + /obj/item/mod/module/active_sonar, + /obj/item/mod/module/visor/night, + ) + insignia_type = /obj/item/mod/module/insignia/milsim_trooper + additional_module = /obj/item/mod/module/dispenser/ancient_milsim/trooper -/obj/item/mod/module/dispenser/hypospray - name = "MOD custom hypospray dispenser module" - desc = "This module can create a single combat hypospray and additional cartridges at the user's liking." +/obj/item/mod/module/dispenser/ancient_milsim removable = FALSE - cooldown_time = 5 SECONDS - dispense_type = /obj/item/hypospray/mkii/deluxe/cmo/combat var/first_use = TRUE + var/new_dispense_type = /obj/item/food/burger/tofu + var/new_cooldown_time = 2 SECONDS -/obj/item/mod/module/dispenser/hypospray/on_use() +/obj/item/mod/module/dispenser/ancient_milsim/on_use() . = ..() if(first_use) first_use = FALSE - cooldown_time = 15 SECONDS - dispense_type = /obj/item/reagent_containers/cup/vial/large/ancient_milsim + cooldown_time = new_cooldown_time + dispense_type = new_dispense_type + +/obj/item/mod/module/dispenser/ancient_milsim/mechanic + name = "MOD alien tools-cable dispenser module" + desc = "This module can create set of advanced tools and additional cable coils at the user's liking." + dispense_type = /obj/item/storage/belt/military/abductor/full + cooldown_time = 5 SECONDS + new_dispense_type = /obj/item/stack/cable_coil + new_cooldown_time = 15 SECONDS + +/obj/item/mod/module/dispenser/ancient_milsim/trapper + name = "MOD chameleon projector-stealth landmines dispenser module" + desc = "This module can create a chameleon projector and additional stealth landmines at the user's liking." + dispense_type = /obj/item/chameleon + cooldown_time = 10 SECONDS + new_dispense_type = /obj/item/minespawner/ancient_milsim + new_cooldown_time = 10 SECONDS -/obj/item/hypospray/mkii/deluxe/cmo/combat +/obj/item/mod/module/dispenser/ancient_milsim/marksman + name = "MOD barricade box-throwing knives dispenser module" + desc = "This module can create a box of barricades and additional throwing knives at the user's liking." + dispense_type = /obj/item/storage/barricade + cooldown_time = 15 SECONDS + new_dispense_type = /obj/item/knife/combat/throwing + new_cooldown_time = 5 SECONDS + +/obj/item/mod/module/dispenser/ancient_milsim/medic + name = "MOD custom hypospray-hypospray vials dispenser module" + desc = "This module can create a single combat hypospray and additional cartridges at the user's liking." + dispense_type = /obj/item/hypospray/mkii/deluxe/cmo/combat/ancient_milsim + cooldown_time = 5 SECONDS + new_dispense_type = /obj/item/reagent_containers/cup/vial/large/ancient_milsim + new_cooldown_time = 15 SECONDS + +/obj/item/hypospray/mkii/deluxe/cmo/combat/ancient_milsim start_vial = /obj/item/reagent_containers/cup/vial/large/ancient_milsim /obj/item/reagent_containers/cup/vial/large/ancient_milsim @@ -134,3 +176,50 @@ /datum/reagent/medicine/coagulant = 15, /datum/reagent/medicine/c2/penthrite = 15, ) + +/obj/item/mod/module/dispenser/ancient_milsim/saboteur + name = "MOD Binyat implanter-EMP grenade dispenser module" + desc = "This module can create a single Binyat deck implanter and additional EMP grenades at the user's liking." + dispense_type = /obj/item/autosurgeon/syndicate/binyat + cooldown_time = 15 SECONDS + new_dispense_type = /obj/item/grenade/empgrenade + new_cooldown_time = 10 SECONDS + +/obj/item/autosurgeon/syndicate/binyat + starting_organ = /obj/item/organ/cyberimp/hackerman_deck + +/obj/item/mod/module/dispenser/ancient_milsim/sentinel + name = "MOD stationary machinegun-burger dispenser module" + desc = "This module can create a single disassembled heavy machinegun and additional burgers at the user's liking." + dispense_type = /obj/item/automatic_turret_folded + cooldown_time = 15 SECONDS + new_cooldown_time = 5 SECONDS + +/obj/item/mod/module/dispenser/ancient_milsim/trooper + name = "MOD Sol rifle-Sol rifle magazine dispenser module" + desc = "This module can create a single .40 Sol caliber assault rifle and additional magazines at the user's liking." + dispense_type = /obj/item/gun/ballistic/automatic/sol_rifle/evil + cooldown_time = 25 SECONDS + new_dispense_type = /obj/item/ammo_box/magazine/c40sol_rifle/standard + new_cooldown_time = 15 SECONDS + +/obj/item/mod/module/insignia/milsim_mechanic + color = "#ff7300" + +/obj/item/mod/module/insignia/milsim_trapper + color = "#372297" + +/obj/item/mod/module/insignia/milsim_marksman + color = "#a01d1d" + +/obj/item/mod/module/insignia/milsim_medic + color = "#2fdab4" + +/obj/item/mod/module/insignia/milsim_saboteur + color = "#1eff00" + +/obj/item/mod/module/insignia/milsim_sentinel + color = "#b536c0" + +/obj/item/mod/module/insignia/milsim_trooper + color = "#7e7e7e" diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mounted_machine_gun.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mounted_machine_gun.dm new file mode 100644 index 000000000000..24dc1362ac20 --- /dev/null +++ b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/mounted_machine_gun.dm @@ -0,0 +1,40 @@ +/obj/item/automatic_turret_folded + name = "folded heavy machine gun" + desc = "A folded and unloaded heavy machine gun, ready to be deployed and used." + icon = 'modular_nova/modules/mounted_machine_gun/icons/turret_objects.dmi' + icon_state = "folded_hmg" + inhand_icon_state = "folded_hmg" + max_integrity = 250 + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK + +/obj/item/automatic_turret_folded/Initialize(mapload) + . = ..() + AddComponent(/datum/component/deployable, 7 SECONDS, /obj/machinery/deployable_turret/hmg/ancient_milsim) + +/obj/machinery/deployable_turret/hmg/ancient_milsim + icon = 'modular_nova/modules/mounted_machine_gun/icons/turret.dmi' + icon_state = "mmg" + projectile_type = /obj/projectile/bullet/manned_turret/hmg/ancient_milsim + number_of_shots = 1 + cooldown_duration = 1 SECONDS + rate_of_fire = 2 + spawned_on_undeploy = /obj/item/automatic_turret_folded + +/obj/machinery/deployable_turret/hmg/ancient_milsim/checkfire(atom/targeted_atom, mob/user) + target = targeted_atom + if(target == user || target == get_turf(src)) + return + target_turf = get_turf(target) + fire_helper(user) + +/obj/projectile/bullet/manned_turret/hmg/ancient_milsim + damage = 25 + armour_penetration = 15 + light_system = OVERLAY_LIGHT + light_range = 1 + light_power = 1.4 + light_color = COLOR_SOFT_RED + ricochets_max = 4 + ricochet_chance = 30 + dismemberment = 1 diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm index 10f9920bcbe3..f2e16e64804f 100644 --- a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm +++ b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/virtual_domain.dm @@ -5,7 +5,7 @@ cost = BITRUNNER_COST_HIGH desc = "Recreate the events of the Border War's 'hot' part-long-gone as a Solarian strike team sweeping CIN compounds; sponsored by the SolFed recreation enthusiasts. \ Multiplayer playthrough and proper preparation highly recommended." - completion_loot = list(/obj/item/stack/spacecash/c100 = 3) //Sponsored + completion_loot = list(/obj/item/stack/spacecash/c200 = 3) //Sponsored difficulty = BITRUNNER_DIFFICULTY_HIGH help_text = "The last part of this domain has a chance to be very PvP-centric. It's best if you don't come alone, and smuggle some ability and gear disks." forced_outfit = /datum/outfit/solfed_bitrun @@ -14,13 +14,6 @@ mob_modules = list(/datum/modular_mob_segment/cin_mobs) reward_points = BITRUNNER_REWARD_HIGH secondary_loot = list( - /obj/item/gun/ballistic/automatic/pistol/toy = 2, - /obj/item/clothing/under/sol_peacekeeper = 1, - /obj/item/clothing/under/syndicate/rus_army/cin_surplus/random_color = 1, - /obj/item/clothing/gloves/frontier_colonist = 2, - /obj/item/clothing/shoes/jackboots/frontier_colonist = 2, - /obj/item/storage/box/colonial_rations = 2, - /obj/item/binoculars = 1, - /obj/item/trench_tool = 1, + /obj/item/stack/spacecash/c100 = 12, /obj/item/bitrunning_disk/item/ancient_milsim = 3, ) diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/syndicate_assault/ghost_spawner.dm b/modular_nova/modules/bitrunning/code/virtual_domains/syndicate_assault/ghost_spawner.dm index 4caf1944fd66..5c47ef1342c4 100644 --- a/modular_nova/modules/bitrunning/code/virtual_domains/syndicate_assault/ghost_spawner.dm +++ b/modular_nova/modules/bitrunning/code/virtual_domains/syndicate_assault/ghost_spawner.dm @@ -10,14 +10,45 @@ important_text = "Stalling for long enough will also allow us to recoup the costs. Complete denial is still preferable." random_appearance = FALSE -/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie/proc/apply_syndiename(mob/living/carbon/human/spawned_human) - var/bitrunning_alias = spawned_human.client?.prefs?.read_preference(/datum/preference/name/hacker_alias) || pick(GLOB.hacker_aliases) - spawned_human.fully_replace_character_name(spawned_human.real_name, "[bitrunning_alias]") +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie/proc/apply_pref_alias(mob/living/carbon/human/spawned_human) + var/pref_alias = spawned_human.client?.prefs?.read_preference(/datum/preference/name/hacker_alias) + spawned_human.fully_replace_character_name(spawned_human.real_name, "[pref_alias]") + +/obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie/proc/apply_random_alias(mob/living/carbon/human/spawned_human) + var/random_alias = pick(GLOB.hacker_aliases) + spawned_human.fully_replace_character_name(spawned_human.real_name, "[random_alias]") /obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie/special(mob/living/carbon/human/spawned_human) . = ..() - apply_syndiename(spawned_human) + var/datum/action/cooldown/spell/home_network/norton = new(spawned_human) + norton.Grant(spawned_human) + apply_random_alias(spawned_human) /obj/effect/mob_spawn/ghost_role/human/virtual_domain/syndie/post_transfer_prefs(mob/living/carbon/human/spawned_human) . = ..() - apply_syndiename(spawned_human) + apply_pref_alias(spawned_human) + +/datum/action/cooldown/spell/home_network + name = "Home Network" + desc = "Makes the caster immune to many forms of practical hacks, backing themselves to the home network." + + button_icon = 'icons/mob/actions/actions_items.dmi' + button_icon_state = "bci_shield" + sound = 'sound/effects/magic/staff_animation.ogg' + cooldown_time = 10 SECONDS + spell_requirements = SPELL_REQUIRES_HUMAN + + invocation = "NOR TON" + invocation_type = INVOCATION_SHOUT + +/datum/action/cooldown/spell/home_network/is_valid_target(atom/cast_on) + return isliving(cast_on) + +/datum/action/cooldown/spell/home_network/cast(mob/living/cast_on) + . = ..() + cast_on.visible_message( + span_warning("Numerous loading bars and nano-scale hexagonal energy shields briefly cover [cast_on]!"), + span_notice("You protect yourself from foreign intrusion!"), + ) + ADD_TRAIT(cast_on, TRAIT_ANTIMAGIC, REF(src)) + Remove(cast_on) diff --git a/modular_nova/modules/bitrunning/icons/remote.dmi b/modular_nova/modules/bitrunning/icons/remote.dmi new file mode 100644 index 0000000000000000000000000000000000000000..e8b5dc723bcc1aaa83eaf45a80737e102634b52b GIT binary patch literal 1906 zcma)7YgCen7X3gCwFiV#)3p@xL53L?mgOTbb%l?RQLLuO$kMVVCG#C1rJ2vf7dmR8 zwp22U9LgjeU!iD`q^Oyxm6}?O2|iH~uC4pyuKVx)IA@<9d!4n;Ui+MrL?RwpuWzUi z0Kj@Tf{XVmQh$c-n$CNTfbbe62gNpN4lyJ$JSPp{Z##2e95)8P*+HIGicUBqM!xn(y0Tz$@Qd&$Gc` zu$a?HDOhs>Z;M4hTg#uvvhxb`{R^~QeXhYRotk6D><(CO_VEeLtSY$JR$BS#+c-D^ z3;gP7gMRQd=sN(cx$oxUM2;$)Jbn7&Hs4?BgI<_-TX_G$#HX4&B|}>{PrY3jut{fU zXMFrf$yYVJ{ z`DhHvw&19JH{Y=HB}dK=$~QZM&fM`080Vq63Ivbe4KDxRA!Y;sNW2incY0|HRQCVe=Hdy0ZB&W+elh`3hkH zLdMcG^#|y)av%QR;Uk>B=dlgFZiKy>;G7$u#tI204c=fP2eB|85D+l@O_V!y6_vH| z2$3S^3m2B9hPR(PYPz~IYa$jZc=Tt{vVCh~(+x*(z6y?1GZ%6uN({MkcPK3FlFD7r zVz6L3E>_bRr099WoKn4+T54&s?axkp$x?1~fJ4tS4dwG>?X_zbk8c*7S~P8aoXzUK z^dM^XQ*ljb?MK{><2Y(4II-cu-s5vQ!tqH32&ZhhRp~Sq?jV?YpEmruQtH&L%z?89 zpP3x%D_a zG!U&<2F~LyW4awpBLUjPT`$$leiVL8tR27JZxb1qcGlGg6sC);pR#RX1jop}JBx{r z5e{|tTMgklivpSOlkJo9Y|YY-q(>@zyi$v?xjUj*yo^LoT-e@-k1em3`e#ZIHCl3z zZ1!&L(ADohvhtRGK2G`WbDZTM0o{;QYHccC0Cgug6$w_dI{1^8ZntSP z57olZ~0w!>|d}4LLTlR|HFE}J0+-lDvwUwOn;5H1x zFUq*chk_eV)bS)WaBw+PUOl_W8ql!-7pUV^-ynpNVDdep0lQ&Mzpim#N3s70E>a9d zs-L_rGLCKRKcg1be4X*7n*4Xz9Uf;BW+2ux_OSqV051ApT?iC#jc->4q5GW0b9cLS z@DV7x^oAMR6`mYD4YJb1%axm)e%~bNQ4gSld|in6Dzfn^Z`Udh7&RmPmU`z7>bf4f z`qjuWw}&OX6%aak^ssetX7Bn^z8P2hBojEDg&=28bd`bn3l{Tc+QdfLLxoN!eXJxh zd#znp(RrF>$x%}hm^`Pjvz+Q2Kn&HtcyUr9kwl4SU%rp8s@l`p(_{XkwsvJDDFJIY zk!HGC4dkl?aqmLY=IdY@Ns`CWsioLEZhRgOwt5(cjQJzr(sJa)Ocg`kb=@z(zjk>X zQ!<=0qAuHd3x!yo|2(yFnWT_^ZJtSW^b_m6YOYj$l-fReBO1L<=^9;L7PIZCXU}dI z8Uc($X8qO|*oO?d9C%ql*cM&$qM8uRo(MkdnA$cjdgg5UZ9CvW4=9hx>k0f zvt%t`Gjjm-JqihRAl{>fuMq~<~8yX({RWKx&xqK l?>ES+U80(%|16RcLD8!fIj-x>Uwxv0n=8@f@nP!Ce*-~zqHq8J literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 17f3845faf3c..3a6ec00c31e6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7187,6 +7187,7 @@ #include "modular_nova\modules\better_vox\code\vox_clothing.dm" #include "modular_nova\modules\better_vox\code\vox_species.dm" #include "modular_nova\modules\better_vox\code\vox_sprite_accessories.dm" +#include "modular_nova\modules\bitrunning\code\anchor.dm" #include "modular_nova\modules\bitrunning\code\disks.dm" #include "modular_nova\modules\bitrunning\code\flair.dm" #include "modular_nova\modules\bitrunning\code\loot.dm" @@ -7205,6 +7206,7 @@ #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\mine.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\mobs.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\mod.dm" +#include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\mounted_machine_gun.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\outfit.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\turf.dm" #include "modular_nova\modules\bitrunning\code\virtual_domains\ancient_milsim\turret.dm" From d3c4510634a3a7d45ba74753ec6f052f52823706 Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:41:41 +0000 Subject: [PATCH 02/14] Automatic changelog for PR #4704 [ci skip] --- html/changelogs/AutoChangeLog-pr-4704.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4704.yml diff --git a/html/changelogs/AutoChangeLog-pr-4704.yml b/html/changelogs/AutoChangeLog-pr-4704.yml new file mode 100644 index 000000000000..a0bb8fd6dc35 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4704.yml @@ -0,0 +1,12 @@ +author: "Stalkeros" +delete-after: True +changes: + - rscadd: "Three new Ancient MilSim DLC loadouts have been added. Go try them all!" + - qol: "Ancient MilSim DLC loadouts now show the general rundown of their abilities in the crate name, consequently the spawner beacon too." + - balance: "In general, it should be easier for bitrunners to defend themselves in Ancient MilSim, thanks to numerous scattered barricades and landmines." + - balance: "In general, it should also be easier for SNPCs to defend themselves in Ancient MilSim, too, thanks to the fully automatic mounted machine gun." + - balance: "Similarly vague item/spell reshuffle has been done for bitrunning disks and abilities." + - bugfix: "Scream For Me can now actually be used." + - qol: "If you are to select a random name as a Syndicate Assault ghost role, -Cybersun Counter-Bitrunner-, you'll get a random bitrunning alias instead of your own." + - balance: "Cybersun Counter-Bitrunners can become immune to spells, on demand." + - code_imp: "General code cleanup of several Ancient MilSim-related things." \ No newline at end of file From f71f73c59a97d146737752fde112be01fbba7c24 Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 07:42:28 +0000 Subject: [PATCH 03/14] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4704.yml | 12 ------------ html/changelogs/archive/2024-12.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4704.yml diff --git a/html/changelogs/AutoChangeLog-pr-4704.yml b/html/changelogs/AutoChangeLog-pr-4704.yml deleted file mode 100644 index a0bb8fd6dc35..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4704.yml +++ /dev/null @@ -1,12 +0,0 @@ -author: "Stalkeros" -delete-after: True -changes: - - rscadd: "Three new Ancient MilSim DLC loadouts have been added. Go try them all!" - - qol: "Ancient MilSim DLC loadouts now show the general rundown of their abilities in the crate name, consequently the spawner beacon too." - - balance: "In general, it should be easier for bitrunners to defend themselves in Ancient MilSim, thanks to numerous scattered barricades and landmines." - - balance: "In general, it should also be easier for SNPCs to defend themselves in Ancient MilSim, too, thanks to the fully automatic mounted machine gun." - - balance: "Similarly vague item/spell reshuffle has been done for bitrunning disks and abilities." - - bugfix: "Scream For Me can now actually be used." - - qol: "If you are to select a random name as a Syndicate Assault ghost role, -Cybersun Counter-Bitrunner-, you'll get a random bitrunning alias instead of your own." - - balance: "Cybersun Counter-Bitrunners can become immune to spells, on demand." - - code_imp: "General code cleanup of several Ancient MilSim-related things." \ No newline at end of file diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml index 1f3384edc369..94b36e749be3 100644 --- a/html/changelogs/archive/2024-12.yml +++ b/html/changelogs/archive/2024-12.yml @@ -932,3 +932,19 @@ in a consumer grade battery recharger, these atmos blocking, aesthetically pleasing, and now superconductivity insulators can be made by the average crewmember if they follow the easy to follow 32 steps! +2024-12-30: + Stalkeros: + - rscadd: Three new Ancient MilSim DLC loadouts have been added. Go try them all! + - qol: Ancient MilSim DLC loadouts now show the general rundown of their abilities + in the crate name, consequently the spawner beacon too. + - balance: In general, it should be easier for bitrunners to defend themselves in + Ancient MilSim, thanks to numerous scattered barricades and landmines. + - balance: In general, it should also be easier for SNPCs to defend themselves in + Ancient MilSim, too, thanks to the fully automatic mounted machine gun. + - balance: Similarly vague item/spell reshuffle has been done for bitrunning disks + and abilities. + - bugfix: Scream For Me can now actually be used. + - qol: If you are to select a random name as a Syndicate Assault ghost role, -Cybersun + Counter-Bitrunner-, you'll get a random bitrunning alias instead of your own. + - balance: Cybersun Counter-Bitrunners can become immune to spells, on demand. + - code_imp: General code cleanup of several Ancient MilSim-related things. From 60986c30363912cdf298310aa18bdda3d593bf08 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Mon, 30 Dec 2024 23:54:33 -0500 Subject: [PATCH 04/14] Fixes a bug with hash grinding (#4716) Fixes hash grinding --- code/modules/hydroponics/grown/cannabis.dm | 8 ++++---- modular_nova/modules/morenarcotics/code/thc.dm | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index e83bfc3e9b7f..76af152cf302 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -20,7 +20,7 @@ /obj/item/seeds/cannabis/white, /obj/item/seeds/cannabis/ultimate, ) - reagents_add = list(/datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS - axed lipolicide, replaced space drugs with thc + reagents_add = list(/datum/reagent/drug/thc = 0.15) // NOVA EDIT - CHANGE - MORENARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.15) /obj/item/seeds/cannabis/rainbow @@ -44,7 +44,7 @@ plantname = "Deathweed" product = /obj/item/food/grown/cannabis/death mutatelist = null - reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS + reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/thc = 0.15) // NOVA EDIT CHANGE - MORENARCOTICS - ORIGINAL: agents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/cannabis = 0.15) rarity = 40 /obj/item/seeds/cannabis/white @@ -57,7 +57,7 @@ instability = 30 product = /obj/item/food/grown/cannabis/white mutatelist = null - reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) //NOVA EDIT - MORENARCOTICS + reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/thc = 0.15) // NOVA EDIT CHANGE - MORENARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/medicine/omnizine = 0.35, /datum/reagent/drug/cannabis = 0.15) rarity = 40 @@ -72,7 +72,7 @@ product = /obj/item/food/grown/cannabis/ultimate genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/green, /datum/plant_gene/trait/modified_volume/omega_weed) mutatelist = null - reagents_add = list(/datum/reagent/drug/thc = 0.3, //NOVA EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, + reagents_add = list(/datum/reagent/drug/thc = 0.3, // NOVA EDIT CHANGE - MORE NARCOTICS - ORIGINAL: reagents_add = list(/datum/reagent/drug/cannabis = 0.3, /datum/reagent/toxin/mindbreaker = 0.3, /datum/reagent/mercury = 0.15, /datum/reagent/lithium = 0.15, diff --git a/modular_nova/modules/morenarcotics/code/thc.dm b/modular_nova/modules/morenarcotics/code/thc.dm index b08ce009f724..925ce3a02a55 100644 --- a/modular_nova/modules/morenarcotics/code/thc.dm +++ b/modular_nova/modules/morenarcotics/code/thc.dm @@ -1,8 +1,9 @@ /obj/item/food/grown/cannabis/on_grind() - . = ..() if(HAS_TRAIT(src, TRAIT_DRIED)) - grind_results = list(/datum/reagent/drug/thc/hash = 0.15*src.seed.potency) - reagents.clear_reagents() //prevents anything else from coming out + if(!reagents) + return ..() + reagents.convert_reagent(/datum/reagent/drug/thc, /datum/reagent/drug/thc/hash, 1, include_source_subtypes = FALSE) + return ..() /datum/chemical_reaction/hash required_reagents = list(/datum/reagent/drug/thc/hash = 10) From 8886fdce4b68f49936157f595575df6c6e87ddd3 Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Tue, 31 Dec 2024 04:54:57 +0000 Subject: [PATCH 05/14] Automatic changelog for PR #4716 [ci skip] --- html/changelogs/AutoChangeLog-pr-4716.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4716.yml diff --git a/html/changelogs/AutoChangeLog-pr-4716.yml b/html/changelogs/AutoChangeLog-pr-4716.yml new file mode 100644 index 000000000000..c5a7b25a7034 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4716.yml @@ -0,0 +1,4 @@ +author: "vinylspiders" +delete-after: True +changes: + - bugfix: "hash can now be created again by grinding dried cannabis leaves in a grinder or with a mortar and pestle" \ No newline at end of file From 036b4c5881d51227ec558d3c03443b3dc8db1fed Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 00:52:26 +0000 Subject: [PATCH 06/14] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4716.yml | 4 ---- html/changelogs/archive/2025-01.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4716.yml create mode 100644 html/changelogs/archive/2025-01.yml diff --git a/html/changelogs/AutoChangeLog-pr-4716.yml b/html/changelogs/AutoChangeLog-pr-4716.yml deleted file mode 100644 index c5a7b25a7034..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4716.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "vinylspiders" -delete-after: True -changes: - - bugfix: "hash can now be created again by grinding dried cannabis leaves in a grinder or with a mortar and pestle" \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml new file mode 100644 index 000000000000..524cc4add207 --- /dev/null +++ b/html/changelogs/archive/2025-01.yml @@ -0,0 +1,4 @@ +2025-01-01: + vinylspiders: + - bugfix: hash can now be created again by grinding dried cannabis leaves in a grinder + or with a mortar and pestle From bca874248c28c748aa1a17584534ad56b299111e Mon Sep 17 00:00:00 2001 From: sergeirocks100 <31294280+sergeirocks100@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:07:20 -0500 Subject: [PATCH 07/14] Adds in digitigrade variants for the coroner outfits. (#4717) initial commit --- .../icons/mob/clothing/under/medical.dmi | Bin 11687 -> 13452 bytes .../icons/mob/clothing/under/medical_digi.dmi | Bin 11709 -> 13431 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modular_nova/master_files/icons/mob/clothing/under/medical.dmi b/modular_nova/master_files/icons/mob/clothing/under/medical.dmi index 16070f2d27b430a576fd09f96a73a4b3aa54fb6e..fb616b9e40d7f92ad2a5474137a500420b2e4b42 100644 GIT binary patch literal 13452 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 literal 11687 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 diff --git a/modular_nova/master_files/icons/mob/clothing/under/medical_digi.dmi b/modular_nova/master_files/icons/mob/clothing/under/medical_digi.dmi index 0b27b7e0d0535316c72960501f6c77e66a32e5b4..cc7c8ed11a6c92bc60ed515f38f9dc0e23ab6899 100644 GIT binary patch literal 13431 zcma*Oc|4R~|35y4v1ZA>k7VBq5t<=8*|Wll*k$yUNBYeke~XY5&uEK!NE zZ(+tZGmM$v^nTy(`@X-A&;7^mk9o|w&N;6$*LAMvd7jsKy`Ga~ZE4KPEXWK109Z{; z3~T`a8qA*$BQ3SYjM=h+dQob9<*Fg|()eK=#3vP2It&(*;ujEAR8&pqT)B7=%6a1~ zy9FO#lxiTip)H4IqM+58Y|}z4eg3+=y{#PRYn+)aZeemc6N5w%gc)!aGDjs!U&)T0qDd4LR zP63!10Q5ir4KILG1E4Gqkdy_S6$J3o0)R9C06XB+8G!IPfSfo$#KOWt9iYerV4zNs zG~kQ?fJYOcA_U;$2XM0iPH_U*F9Oc70GLDo0vrHV9ssBKIXy)K`_lk6MSv6-ASeL< z3j_G$fB**oz=Ms&myc7<(2-a6!lfG#0V2Ff94wilytl#pS!eju1vt-&OR)(^MDdDV z=j2Kf6fBe!mz0!)KuoxK1U=7kjg*0^sW(9rVryv!&|R6nK`nif8d(Ki$7}E1rN)dtvQ@+zqTN z*=cLp`~L2DK{8Urs%OosAdu(cZ6TaO(f0PZcZE5uKC3@b?NzqBJz4XPd&DGL=rlfDkvuhY{j;a%Dv#`Bu+wySg;0p1IP)=Y-+~0@=G9j$ z&LzUzPh0AxMoMVHN@J>aO*}6anGR1f?1qNzjY#z8pcq`d%2Mwa9cm_d-?<)^bNKtJ zl7VhjwUp~m`!E{m$MXZGlw|rxA2M-Xk-WiA7MWMb84TiT$b!3iVUc0@Ur%mxzYux6=L(S$4U_DUI)QA_y-vAYtO8>B41Nc40bDCqw_EqKV>Wi=D<}18&eBZr8;K$Ll zI}S|z3q`k~0Du_4)IjelykIMu)l0bl&hl?*0B5P1DvK^mC$kSI0bv}-E_{$wz~zU! zEqTF9_Kvt#l2>n1^^($VbpM0wwQWXQ2|`89>xdhSoF}ip@hkY&y0TBiEo`pm7ft;d z|D_$IWh%^;*gYSt`OjDS-b2d{rC+7--)qj(;cUO59E2(|^T#P@Z}py-hH3CBLksyaJKdWH8iWUh3a6=a&@iY|!~ z2b%L<<1UeJYOwRzC}7a@JQDe8LU^$zw9Iwd={J=Ayfi61V7bVk?%o0#^l<1wPnb)04!=5+D3* z>NBTLV|~dI%FU!uBv$Rl)0pzccr{^8S?J`luBOF#c-)7(_86MCq9=SYsEf^doou%{ zrA9_Uxe{W?Gr`1>YjB|YIY#C~PnHYe50z>qXqZkRhY+G@uG=J|y5QDgn~kLWgo z7+tcbz(c^wy8Q(>cMW)&{XdP}|K0d_n-@40&?#bpNmr^pHJN!z;#LL!YW(jkYv}1Y zXGVKX8XQ9c`oJX^#?@HEqQh?{NxOf&1D3j{cW7FPss)Ca>&{jJ`fx_T!8U2ZIH?)g zJeOduJR7Yl(`DI%z`nY0S@F=2P@Bf8g#oZhT~2$zcu- zJYC6hV@oT7eXNtGQQ6Mp8-V%B(LHEdP*-;^jmuyzV>hzg3dZaF__9KDqhT?mVDknT zFDBB|5{kK`RCW1&cA1flF<)Z|^Kdnva;ReiBR68~oNmF^(64Itojaa9?`ss)leL=B z(e@sJZSYqu&4$HK3zq&fCN z>05E#$qam&A0Q-(8M_CDVeeuN4i-C^pJB*hC?fV;+Lrcv;UZr9Fz<=oAt4ywvf<4Nno$iaL|N2YO#h3Tt-A?Tv-2Uc*<>jG> z)S(~qc70>=e9B5+M|vF>I2Eo%CD>vao;+%F3^~com7%Wq{I1A9oC>g* zoPV{4p5*5J|6+uw%xu}EvjUc8=%`V`^=zv+^y@D3zt(+Smyd1v;|y<2S(-h)#UUFA z6YveQa-QrLY^yYV=oh}Yu6^y7nOHu@Qy^10J#4>}Z% zjEDwwxe7`z`12(2=d_jS&iM*kd2BCJqkEtW$rH1%dOe z=#VlAa?g#CS*erv*6yim9;QG}eqbIYil#`{!i||(sr&z}W-5wZP~cGjC15Wbua%sE zxnfe1NU@~u^QUNr$KTw-%D6*=FUmaN)4B|1CH?@yESDITz`34`9z{y@SMPKb8!Ibw z|6vI8e6)Ep`utVn^N(xIdo{t{s0T+$gfhp=JeIm7^FI`UeJ_Q5|A$1r+A=Yj|Tw{E{S zzZ>Qnhi|N9ZYuqo2h3liXCiR6VWBCyIB5~up6@Z0QCG$>PN@G|jU)VHZe9i`Q!in6#o{Z*#tnC1V_ zh4LLrRJg#(2+kSC4-;NUCQ=E5?=L!FxhvGm2ba}jndC&)Y;iWDIT5d7qHgDx_O8~j zDC4dg`FG|mT}TGGTaI3?H}JTfmr3o>WJKzDuVMC;2YG6CV(Mz+JmK#8KV|o*hf3H4 z$)?yJI*yA0FiiO(%q5ql^7B1)>b|4C$goDX7mSq)=%okqdkNsW>arD6tyHi2R8M1Q zOWaT59Bz!M|4-(KDRp-FnG5mWtzVzLaBu6Iw)S%nD5IOSTDP1s;iFcty3Vr&EAn1 z`P78}X7=gXJ>$8n>>u9?*4{NMs{Lq067+ud;MQdA^Gcx3MKePW-nAv`#-)2`)khI@K9SqfmeQfE!30i7CBq4VNS_Fd=`WU2AOf@M6cIre(B9-p_c<>FsnHNFtv zArLO#bKG-y73;m?at8a#RVAL=fo^4H${OJAGcTX&f|aqb^AXJV7Dv#_>uNoj8K-l@ zOt~W#KR3)qEgnpv*N494(zenZ1O&BO!nZy*08p(5D**)ytQ=?=C{$B%#c(a=`n}ZF zDpqDUz*3MS;5CioTQsvS(_6QBBVj9!a(@40sWJb5JP)whwW`$JJ1ord;cGz0x>G&( zD5-Vq(x2KwbddIBkJz?Tzmk$B0G5EF&oJk<%hh%eni2g{b)W2dqh0q-)@c)6zC5EB zZda~($cQQHVlThBkGx3p1xDAWGxGSn54WVc?sISc19N4>e6agBk+q>|z~|2?pwbKc zt4(1mg0Z0TAA0@WHiyihMqmqE)+6_=JB_1ICDPzz=S&YcvoVJnF1u%q2-&=@~_b$#EUT` zV2wk(FgNOZ&ei9MT&z^rBuBj$nBo19t|OHRxGC@4%2~}=V8#wy9q8<6u4+rV?To8= z```=Lh0aMTsW|P||KT0M9YI!cSz0j_k;0S2;bhcJdH+|OP*!ub;3AhO^VsKp|MF%y z&L}*T1u9Du6qUxhc=m*N3g4>y^2*_DmHOkXICe3hnPES9LXeU%F4_?F>-Z0A}+#AeFNTPWg|kXO)1#l zN4~68)o-sZXI%OT!=CMto=>7{Az{NG$a)=~)M<_7)LWA$)m&YZvZ2^FZe)HdC!ys4 zBVrP4$k>8WhmY(G3YpX=I=*7~{7rn>7Xov2UED=23EU^j?v)SD(Nk_^9gg`f!|aAS z9BN1bX~e`4B;x+-!?6oFhzRoc`#-A7|VzhDQ1?@9VHH`FMFTW|u48=e;E4w5b&p zds1qh(fQ=>mb2>vlRKd=ffLKsbcJK?-&5o#28c%o-cNyqG56#J$HOtdxbl%(5%@gPh{C>xDI7Q^wEOq&k{>OZ^f5t>BZu|Y z^S(Xu&1o38uWiUK*a4{zm#4uiBhz6X7j@JZ$5VNFM~q%^cKB0*gHh$ldg=tnP)gMT ztjtmYAmaYKfwRCg>h^2hOLSj~{VCWUvORV0dN#KrVsV^Uu>&g%Q`-U;H6uc2zkWby zK5PHGF#TVr(|^71d+bE1rZ4z;jOl}q9^X#tc(s0s4oq!|gOXsy;7`(bTODZfd;b6; z#H6KT!6Z7oDV1f7MprTy_E^$$c|oUK;%KPun%7^$zqIf}{i;N3p+2}_p5aFX8Gi*BFKynpO7_MX3T`Y$ZvB4w z6N9=v2AwH;XVaj+SdqZSG;!&i?R&VX{#ifKI6dTZ1&`;XI*aLma6f~z4AAe;tSnl| zlsvUw{^Jk87V6UuyQf@mFn2hhMKQt6iljTQSzsQrOt-e3zgE2iwwyB(3aWMw*PbMG zE9+s5Sf+uL+JYAw;P&fBiF5AJLcP*vd+e|>Z5fJN8aQw_7ahv-^ol!Lrp@+yWaoC7 zI`uXEG+#euPr>HMJ7UZR%{*(Og|-5lpR`?@4p?M*8@>3NJLUJF+|K~V@Tc@tOu2A(yq_}Sa%+h= z5Sqh49T%D1&u$Ctg0DX9F*cS?pe5gKrQCAi36>+z*EalSp3(iN6eQ`yMXCLRwVRI< z7gWv9_lJLp-9Z*ew`k8@9)*@Su$ebS+i>pt3E4IKZg|5pCffh~~4V>Qoru{?8 zi4`}Z^52yZ)S?|1U|Amrm@gykAs_CLY5f8y-`9^59f70sRB(1a>zO*~HlugcpBt*i zUX2>%8($&UZG(%H-a07mZ@hxP;68E1zzXku0+J;c6mC>v~_Aq6Id_XWG9g+R-8|eCu z4`FK}q9n;j=P3JH3oJc^g;S-^^}f~nA3I)xq(f(&YDnXoLS8)?98f))zf3h_njviD z^)xl18e`Hpat`Alx(NDZS(5^kDD)yvtnsK2m`HDKl2%FYlrNFZaXWIjy|0>t3XKbE z%8QQ>`NSw4(K^JD1dQHk?a=^tuky*Oilrfr*qTqgeF$0dwdEt|o>hiDW#0*B#Ye+0 z7IO{nYHNp~U+mzfyuEue(gjtdiPLB8L49n)`Sdg>1*a@d{X$HG0$b4Pth+0qqK}Bl zWJL8RFht|l?mSTc_*Z=}vSqDv@!{f>`X^~|Jx5tg_Q@L~Qh;L$>0R3xrrV-6zM7^m zm?c%(Pb+5YBr(e)J@#7gwhIbQpp%|DXoC%qE1T+D4EtX{|?TZ;I(B zsa$5!4~?f9y-c`{tk{IrFTh${NU;Peto6om)X~h{PZKuOqY^5%Vd@JEc%H)>ldIKq zpZjXsD8Xkk#jzj$j2E8RM!}lE%RoYo@C~xPqm!Wp<-(#|7{w81;r)Ybe~H{$QjYlf zHD+Qr=zkoCap!~E@pFavlf>#>6#gV^HJal2h7@wNm}Yu7_lv*b{ey#(y44oa^ZvmO z0ju-wb50HTxiSNE^beUYXlUfyA;d}F4SVuup{Wx8zLKb0zdOuHn&A3(vA!78rMcy~ zR?$Jk+0So-UP@O~pM+^#=u`ZKz$=jc3^}Dw44NtKaLdT^j5`VI|3PlCSfI9q4$Unc zwvG%UM2_PtS}EIC&+QzuyDlqp4IGBL&`h3$!3eB=bBO8bBEGh>(t0(smB2Of{5=?& z_cydPhW_W?7##X#90Q}i+1HrWwphh!gwq%6UqxZvGYEKV`pS2;BX9t9M4p0?#|)V+ zEGzY56LFioD$iPDZ6ex!h-$j)ZR|P#XWMfAvhwnxeOp?^_j4~@l^bPDd4DNL2e}MZ z67I=IXxhCE+5$@1(|8izy{BL!+S|`KBD^li>HgsqC91`Efz$$y)O1ocq{50_K5UhV zslODYMm4wWvMsn_=|#yew~{GtreKdI4#A>!w61f-;F})ravn9e=6ERl++!~6->aby zmx0s?`HQYzj4$wOPyI@li_nxkOq>Kc+)un6L7B%ze2tGQ>!F&&hJ9fTX(io--|VXp zP)tUp*-ExkZxv5br}|2b#FNA++JDmr9_(s+MxbCq z$3FekU5s)YWUxkv?7UF3T5^H8ATZFL{Jq+Q$m~7{USx7Di5ilD;#`T9X+Q>qf6U2I z=;27;N!ds0Z>DWlAB+U%ke!c)9D1O`QSJ5hz01%6RVi7DgZU7QXkIh5H{u@Dfq+Y%(-w`yl)rXL%QLzG^eM$c@JU*rp+3O%q zMQ)tpyQ#l`)2B-Xj>eeImwWUVzeWixGX18SH6Y*tb!&Q^w%4g3wI(KNEH3AD+o?i6 zPuq~jpr_8O;8BgAFtvTuhbwB-xpl&~DUO&j! z@a+E=7G5m`c2D2P$Vg*tcWpwL$vF3oR?<)Hmi?xd_%9xjzL8;JVM4nhH1`|A4*0Wm zTP~+v|2EXo))IYB`vv9xqU7{!n*abl;E6AHFi5UVc^@QP=T0V-)2-fX6{vSNoj2MQ zpqS;RmmXPwW$0|QpR84VAu62PT%Ma<w~Z9CGd&N) zqC{TzDd+0KMZK^xXS-Ah`$VAZwFwK;u`Z>El_69{7i~_<{MSJ)c1SY9VOVn4+ikzo zIA*Pox$=^OIq24^tJx20@)k8pE(_ncjnvYLGoqD?zq|cIlF`83vW&G1@(~LcG=CVQN3D?L32e%G)5DCvCSf(FdGT8zK?p(3eb&IdKhQ11YTv#W2 z?8_5Vyn8~9ja^h7N?HhMJo@SPDrK;(O|ecb1i7^Fdo)T{7OlYd_y*M0FbfW1nT+IP zi{GTOp;p5+*#%iXm;2ty4J{?1?^<)?T``uA08>Bim&Uihvfv6dlTK5zZUag=(5wT^ zPXkZ`j1Lg#d&ktx3|UpWwf(!yh-gDR@2>xSc^)Fzv-R8L`;YeYAQSueW`twd~p;VtIJsaU0q>(X4*S)2z@Q}7BN? zkmLOvZM^?IcTNm)=5sLLWl5`sd5sunml^RF^{+*PBp;V|?>$w6ux56L{U&J8C~JH& z$aP(~hPJFcnxGp6l}r5e$T6;!SNkSibr`?nB>@RIwR75*c9>8b!yUwA+&4R^puiN!iL{OMC{WRbBeOgq%@ZrE~C=LDU9VB2wZ5M{R7)w;`dr}g+4 zQH;GxGaGJP!rBhyA6w0dpLSz-uE&;Aa%T(#aQZU_9N4C*mDy6w%!ncQU`Q;HT!| zM%TKe;x-{s&ZwV#vVW(gakl{pY``Bb;~}<>DB(NlqDx=gGqH4);k&(*Z9I7#U&6_~ zK*A(~`@+pSNiB24EU01UGs+2+^p*W(;%drWoO4NUB?6wgpM&b{C7eAQB2gc7q>D=u zG!f7C7-Sq2k2X(u(XQ9f2A*q60nW4?FSg0ev%psicSr&(*sKf)LG#-ulew^Gls!}{ zcsa`!13gYby(A1HHkHY{HP?;V51sTj5Y8QKS-<=c*=&410q9;&tz@(8l@i1Hgoi)I zXU-ZP&qUg4w6Md=5AmLSu8ge=Tr)S`nh}70r2X6LMNlF^l!Kr>O!-}+iQ)z#_I^T- z0)k`2v0&2YxfqT6`@!dg9_gf{#4C(3J_9S2@2jTn(jBd4yU2(>WHLP{mBlZMaPF*1 zh;R4=ag89=_hi}37eB;5FFfw7sDb{NHR|{X0)oet?S{DL0(2t5cu4E)h zBaZMLbgR-pO1BjS=bIV7K6_D&hA%OtWIi?@m%_|E;-w(!V+f}o>gO?7f5|6lYIkkF z@aF^sj}MySf>XAyJ?<=Q3BzZiB`h!Fr(jXy3%`z+dhg_75qNyZQ4tmubL209cuO}o zX7qh$lvVK5m>C6ITaI{2_l?vo5gbom{~6YJ@>O~PZ{RU)xW^a)Tc;^anYMblr*Ikz zMx4aRVvWy{jiH3!e6P`cYRQ4L6p6MT(_~-e3Efwq)d@6xit>f`aqJdPEA%seGu--Y zey(D+G>GS>aSFwSGxu0`+k!qse0~S#TFcWE&LOL0}G?kyoI8Ks(yp@WcK)`7Ivg_+L4Oe5~+%&x5ij#RLP^i%iy|9E~L3TNJh5 zIrsT)VZ)?&_|63;9%3%vQrWjWiD?@IXJE}mPM<`qFS>*1NSbMmC+K`Vz zh%w8T_q&(c`nVbZQ1Y}HL3Df3irr`(Pb&^_q0hgB$3YB)hX>FV?FB~ zPg1};F#-sG?D*QLCT5-iVJ(`sk0?_ zh5o@tN&S^|F1cabv9CMhIpyZv+k0;}_6Tsu{kf5Na%U63}HsvYn3Sg8BG@g!e_(4fY z8s}10{l{(-kvw9f))*^Dd!8QW?(t2_iF}a$Gb|=XnnW`vC7>fIw!JC{_UoB@NngcG!d=qG zP>A0Xo6#f-ZnIHlN=Szh>7%~UsJI77%9L~|O`3$2-q{2WnF)wDo!rs3ZQmA=fXhDn zS(I8A3>Wb1^xV}QnM8d^F?B8@ma21^q4yf&g z`PyLw@FUlI=!)7P5!8?sbNT@B=N$QPx@OU2+4Px$p;bt!z#S4zcX8MNIPosrVz?FI z(0T6S3p7#2YVQF#9yXm}6t094V}`OkzA1hW^elhRhmBOn&&3#p$`&dk>Gt`BK%XRF zLDzK#!mywzwyI#MeLe;|8$vkcw<#07DhAc7DYcphiwXbjm=LeLUH5TDcl;P8T=3}y z#`w{y1iquOMjboKVEuCKYv?(4vh%4YdvpBrH55y@-kd}m0$r^k5}kR20dM8-HI5SJ z8lEaGoVrW99mf+Uj$^7J$8$aP^Z!ke1*Bj|&g_6Q}KYX_-Y6-2&? z_!|t;E}odZ`1p983|wkz`UyAy=>y5c|vojlz^D}03- z^pn@Ja`>3Wpeo^=S$n_ii2e9H_SH}X<~vIRhJ5{tRZO9uH&S^kCyn5HJ92sb^l1W- z?tf-rh#&f7W)9xBEKD2@dLlR@B@39QK05M#$FNj_otTCxdy^d~jI#(i{vn66wbQ&n zGx|vne@Q`e?CLM~iyTCT=+;ZsOS4wGAQoU=$r>dxZZ-52nHF@4`8vcR^n{GcEWSY# zzmNVV@TMt)UW2xKMp1LKDo>_%@@(PifH73(Mm;Sa?O&7YABT)0=RCr^?!rmGR);XFX z&6qWR^Tnb87o-tE!9Wl_bylJ?l(;(-ng#YX4?&r;MVzBw@$4RP)Hq@M>)1QzKQC{L zTWj9@@_N9PiN37ud`3fU=ebBpOp{-VtOF08 ztE91}oTqsUu&1%1j&<(*qNLfZXxO>gE~#Zc8f7NlJM_-Aj&elDcpYjA`SY=#~9 zjRIDW0MPWf&0dVIKY6p4l0?Ur=YIMV#v)oVA>i0iL`zioQEV-PI^hU7g|E>H(Sf58 zmIDk%+O4IN{QqA3|50UKIc;(5xO#~^-`%~TI+zz5&V^?*4*b!fwS!~th}mCz93vVn z;)un5oyv}bKJMy?PFoK8tJS%X^W6^_h)QJ2>Yd^wZkbBq0?$RqUs$9bOk6gkl zfxT$2#)z3vfKYcwYmq0*PwE_q6(T6D)x;|7S@IvKg>Xpd$h@fQ~T z9+}w$#Jtduh)!$+NoI8G`&r%+UVnrdvbwjly)gAI1;GaiSN^7F-=Q`+gZ%t*+!em7 z8BX%1k-0)4dus|q)@7K%yu9Q7g&ba_%%B6JKPo&z%d~zi0 z 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 Date: Thu, 2 Jan 2025 18:07:48 +0000 Subject: [PATCH 08/14] Automatic changelog for PR #4717 [ci skip] --- html/changelogs/AutoChangeLog-pr-4717.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4717.yml diff --git a/html/changelogs/AutoChangeLog-pr-4717.yml b/html/changelogs/AutoChangeLog-pr-4717.yml new file mode 100644 index 000000000000..3406a22cad75 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4717.yml @@ -0,0 +1,4 @@ +author: "CoiledLamb, JohnFulpWillard, Ebin-Halcyon, axietheaxolotl, sergeirocks100" +delete-after: True +changes: + - image: "The coroner's scrubs and jumpsuit now have digitigrade sprites." \ No newline at end of file From ad507c38007545163e8743e1edbaf32e38554b82 Mon Sep 17 00:00:00 2001 From: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:35:10 -0500 Subject: [PATCH 09/14] [MODULAR] Disables a few required experiments (#4718) * Create disabled-experiments.dm * Update tgstation.dme * fixing this while i got the second * moving this over * Update disabled-experiments.dm * Update disabled-experiments.dm * Update modular_nova/modules/research/techweb/nodes/disabled-experiments.dm * Update modular_nova/modules/research/techweb/nodes/disabled-experiments.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- .../techweb/nodes/disabled-experiments.dm | 29 +++++++++++++++++++ tgstation.dme | 1 + 2 files changed, 30 insertions(+) create mode 100644 modular_nova/modules/research/techweb/nodes/disabled-experiments.dm diff --git a/modular_nova/modules/research/techweb/nodes/disabled-experiments.dm b/modular_nova/modules/research/techweb/nodes/disabled-experiments.dm new file mode 100644 index 000000000000..062cf5bbbf22 --- /dev/null +++ b/modular_nova/modules/research/techweb/nodes/disabled-experiments.dm @@ -0,0 +1,29 @@ +/// changes required experiments to be discount instead +/datum/techweb_node/proc/make_requirements_optional() + discount_experiments = required_experiments.Copy() + required_experiments = list() + +/datum/techweb_node/gas_compression/New() + make_requirements_optional() + return ..() + +/datum/techweb_node/selection/New() + make_requirements_optional() + return ..() + +/datum/techweb_node/parts_adv/New() + make_requirements_optional() + return ..() + +/datum/techweb_node/mech_combat/New() + make_requirements_optional() + return ..() + +/datum/techweb_node/medbay_equip_adv/New() + make_requirements_optional() + return ..() + +/datum/techweb_node/explosives/New() + make_requirements_optional() + return ..() + diff --git a/tgstation.dme b/tgstation.dme index 3a6ec00c31e6..9b13b1e8506b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8519,6 +8519,7 @@ #include "modular_nova\modules\records_on_examine\code\record_variables.dm" #include "modular_nova\modules\records_on_examine\code\records_procs.dm" #include "modular_nova\modules\records_on_examine\code\view_exploitables.dm" +#include "modular_nova\modules\research\techweb\nodes\disabled-experiments.dm" #include "modular_nova\modules\resleeving\code\rsd_interface.dm" #include "modular_nova\modules\resleeving\code\research\resleeving_research.dm" #include "modular_nova\modules\robot_limb_detach\code\robot_limb_detach_quirk.dm" From fe6ab1414affa25b3ca4b47fe550999003b06828 Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:35:33 +0000 Subject: [PATCH 10/14] Automatic changelog for PR #4718 [ci skip] --- html/changelogs/AutoChangeLog-pr-4718.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4718.yml diff --git a/html/changelogs/AutoChangeLog-pr-4718.yml b/html/changelogs/AutoChangeLog-pr-4718.yml new file mode 100644 index 000000000000..6eb4bf8e466f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4718.yml @@ -0,0 +1,4 @@ +author: "RatFromTheJungle" +delete-after: True +changes: + - qol: "made previously required experiments into discounts for a majority of the tech-web, pretty much everything but alien tech, surgeries (to keep the coroners job safe,) fishing, and illegal tech." \ No newline at end of file From 8a690397c6fa0a57af1695d6763a283703ae9e9e Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Thu, 2 Jan 2025 18:39:04 +0000 Subject: [PATCH 11/14] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4717.yml | 4 ---- html/changelogs/AutoChangeLog-pr-4718.yml | 4 ---- html/changelogs/archive/2025-01.yml | 7 +++++++ 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4717.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-4718.yml diff --git a/html/changelogs/AutoChangeLog-pr-4717.yml b/html/changelogs/AutoChangeLog-pr-4717.yml deleted file mode 100644 index 3406a22cad75..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4717.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CoiledLamb, JohnFulpWillard, Ebin-Halcyon, axietheaxolotl, sergeirocks100" -delete-after: True -changes: - - image: "The coroner's scrubs and jumpsuit now have digitigrade sprites." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-4718.yml b/html/changelogs/AutoChangeLog-pr-4718.yml deleted file mode 100644 index 6eb4bf8e466f..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4718.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "RatFromTheJungle" -delete-after: True -changes: - - qol: "made previously required experiments into discounts for a majority of the tech-web, pretty much everything but alien tech, surgeries (to keep the coroners job safe,) fishing, and illegal tech." \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index 524cc4add207..e9f32385e850 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -2,3 +2,10 @@ vinylspiders: - bugfix: hash can now be created again by grinding dried cannabis leaves in a grinder or with a mortar and pestle +2025-01-02: + CoiledLamb, JohnFulpWillard, Ebin-Halcyon, axietheaxolotl, sergeirocks100: + - image: The coroner's scrubs and jumpsuit now have digitigrade sprites. + RatFromTheJungle: + - qol: made previously required experiments into discounts for a majority of the + tech-web, pretty much everything but alien tech, surgeries (to keep the coroners + job safe,) fishing, and illegal tech. From d28a2e8476b45fd524a9ab4e5903ebb70a128fee Mon Sep 17 00:00:00 2001 From: SomrNetwork <114457130+SomrNetwork@users.noreply.github.com> Date: Fri, 3 Jan 2025 10:05:23 +0800 Subject: [PATCH 12/14] Adds donator item for BonkaiTheRoris: plushie edition (#4707) * Adds donator item for bonkaitheroris: plushie edition * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> * Update modular_nova/modules/customization/game/objects/items/donator_plushies.dm --------- Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../donator/mob/inhands/donator_left.dmi | Bin 4341 -> 4638 bytes .../donator/mob/inhands/donator_right.dmi | Bin 4287 -> 4567 bytes .../master_files/icons/obj/plushes.dmi | Bin 71702 -> 72407 bytes .../game/objects/items/donator_plushies.dm | 19 ++++++++++++++++++ .../donator/personal/donator_personal.dm | 5 +++++ 5 files changed, 24 insertions(+) diff --git a/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi b/modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi index 5304cf9deea578ec6eb5d4868b751996bd05effd..be7c2eecfb9187b14cdf855eb36a834b4ffe6f05 100644 GIT binary patch delta 4231 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 J_kY}v_#XlE(XIdh delta 3866 zcmYjSc{tQ<_n%3PQiHOj8L}3JWEm#wjL5!a8{32^2BEQM`Hsr|$T|vH%APHRWE+J- z2-(M)$-eK)@b*0K@Aq8q`R9Djxvz75&iUNuzV38^ZQfV`a7)>>3^1BZCUbJ}Nl2j1 z(Oy+0$_l#Q*HSR7}gLw>d*R%$n z;9$$ibrzxUH7eLXw&)s%a5)s0ChZZ))4w*uO04<2i>Lt!K)LVcGJw=x6zk z$v|9gY+A0>U{~q)=RPb|msrGs!gB{F{PPv$+$|>MAP@+es;R1M z?E89|5(TiBu+y(;)Q;ptnwsCqskJDIVZFQXYV0o#6mRlrq0Unz2VvvB(-+2aWyZYB zdCT9&=#M_|+gTlxPpC@vUrkPyPqw_2G67&=at;r>ptIlk3sBK5AW-IL9rI}a;9&Q0 zWYu`s$?=bg-NMT>#Gc^<88e{`UJTq>Wg2Rn-QKO=TLfpEY7iHH?_b>wKKi^eMi+Fr zOTRR+c&}Up$+4-RI(#rz`)u%VZNfU{Wi=}BrV(PfqxAV`!)yVz&BUTI`kpd9D+gMV56zdKsP0=Fmm@d;3KxzT1LRPme=~4%ODiRZ6RH z8E<%Va1#N6-yD`RS7Y4Y-qi+lvGc{uzkI#PwbHJo4Oi}qR`XUe)+x>O5u1XKUu_xb zOk^w-!YO$lu9#ozKWLfh&1()G0X-x&k*C7B!>|ulNVH z*P)CNFPUdmYx82V0GkQpPzn;HQ~>?>M)=iI)N7Fqn!^8%P;|dn@SVRlsl$Z z`UPaBWG8$B$ZPL6JYvj1F=Jt*Zt|<$qy<1$E>aBBOzThZb=i8&%JhFj{Oian`rX~D zka`7lqsZ3AQNY)^xiHE`SXS0T*5O^9t#pET^RaC_b7}~O(!pNZz`8c5%shOGUr&Fv zj7x}nqRPTPGRuE!8BwM}l#eR*9KxowPOu5NZ@Le#e-~)$d}g@{TTx!R^WXkxazMkrlkm=YMeh|kBgH^Xv39ig# zSwBV1&UCQd*FKYw1|E%rpEdU`oH^wpTZ^j!|BphMvu398DGl$afPmi&1SOKJ)n-y2 zZvn&nhUlfR317Q&LmT+&36n#)_vQ*;&F$(b%>ffuN`6W2-~L);k;9opGe7$lY$2vh zaE*)8upiw&X3wx;H9P~(`#yVk|p7&Im0YX zFKvY3wGvwixCBRINzl_vm;JKP+|t$j0ZG)lp`EKEl}Z&7#wOo3G`3TK06@{Nxg))ve{{oz>*pc6|+1M|J>1qIP91qB7}4&<$YlH&+` zOG44lgxhr2w~<7R8x_4plqBE>sNF z9Fro)A*UM{(^BM=9=D7UH(6{;Zeta+MFp-8n;=}R>6(8^)@o=1Q+EKRw)=QRD6@xA zSC@{?2Qk?`7hwtxBOwtnCM+0*-FMROVi%OIV|Z)WA=)Ro;n$#XW&otEP8Uu|JTE1+ zB3YK>Ui!?K#V8V6+QnYV&@?=~R1^v^D7c32hB)rgXz!r6$US0pI~Ic+*>9o zY)=yoU_7}=$+^H?=AfpJB&{nJO1vsF*LAIDVD5K~Xf4gztBo0?iK6lmJV%<2uDIdn z+Hp^<(N)SzLZ8@y=$%WiBai%a*WhMs2sA@^j_wp&OpcpYW#Yf2+wU}dw>Z)P;~c#r*vRsp&|RSoRH!aFp;72=Hs5qda=>2(h?l^y zrVTn0>R5a(K<0cU>|$|0dw{pOeN|G>(c{N>O^f9spN0Z$xF@VuvO=Z8;+-k#s(BhE z1ko0DBM_3y9{S{>Oj+qNtvdWR_vy3$jp0<=7luc z>_yvWFDl^TC~Wcg-jrJZvD!yN;|NIXAffjAlIOc|gvlNoskityECeFzk0j^Ww?p&C ziU!keHbN+_M+Eh=WBWOe<<}w#c?hFg)vhMX{^adN)RI4Dd*DWcUh_2|ylbLvusn+6 z`!AndN!uLGLB=GnWQ}IcRgDMDNKFAXi)R0Q;JwWa`I*x ziK)XPP()k`$Mh`+`o;>iDb1=uVg@i`QC_+k^?9K)m8|h-UX0&`ToV{0r?yJz>jg>f zs>v3nR`DGj5W{7br2(=ROI0_h2D}Z7Obn>2r8p3M=wQ3w))W`MK|A<;eDJH+DNdNq z#S8gg@1Gp_1QwWDUP4U{4Z`Lx*;^|nrq`npK7;sbaO$G-)m`F~&LF7$L~suDmX9mS zRU2v}p$Luj@JTxp1KF!*a>UKpbyfc?%)GGy;Y1P@2AmrJs96au&)Xvlj2hmJYKBWx zJ*D|nRB`?!LWYT3q ze|8ov;ol#L3`NSr3VQ%5thlIXEbpLK&6O*f(l&JNJ%TGoq_D6E94Ak{R9fe--DX(4Jt@34$y>d*rkrp4 zyk4bbrr3{d6Hhj(Rb5;x z(kPkxggeS>nxC&X!TMAm?!u$zUS>j-{LCH?WGL7&Ss7Q_{8K&>Nt4sS(gmzEF>xzd zxiwTs<2vY1T1ni>Xkm5+z#@KpoLnKN=S()TW*FN*8SU46+3=TnkaRWl1R*1w_dT7Ut7 zNe~DG4lp$|18M#oaXpfCaOPG4y0`tE{XFgkc=&jOK-i4Lgm>QWrB6MjESj0$TP(bk zGIBeaNzRvxV2lQ$Jah)~{l8U__K#hkR|q%#p>ua`*Q?uCrq_PhC*7+KN6lBm4}WsK zI68H3-r%&2FUO-D=QQ);?q`&6H^);;y5K=RhVMv&1QCF}u^yF3kq9<ozj?zK z*U7E+7OH1%xb5&GOwVP)A286SKjdrHeiF|Y`})YVxDheZU(Yvfka6o`_>`G)^?Nj5 zx+M!e9S8bgqN;?n+v>ZOv5$FSxw#B)SWe@dGpwhGi7UJ2o8;eVjYQDo6UXQk)Y#elw-4n9Fna%fqaWZ_a-%9K{ipLjshXM^6pDnBAZAN=O?zMQA>O>D6~$kqd!U(M6Qs4s)4(zH~x4Gc^@( zM|-}s^w8h=C6A2cYis1xIApx7n$a#hFhavzmqQ&F^R}*j_s`y^yxUQ|>9*Iq6(c0b zeQGl|+@lM|FSl*~?EO9s{W-(7zOG}{F&%TWt@e1P79%!cW6I+9oLlZi;=945H&DVe zKh}USK+6m;Y2(6t2FrNuPYY`?Mh=x6`~vkg4)XH~Sa;AZRVoIXe$_Ep9EwFd9KJ3@ zQq*_L@6UNrykdyp7%AtuN0rKjg3H*642v%s;ZXOO+$$PQ+FKNPvdnWevW`kVf5}*# zWE7p2R=?i>*XA5|+UtegSVunXAAHa!UDyk-CLR2R4C;f|-9c3Bqo?t`7XBymuwxGX zOV203I7n`AON~H8sLv4JAS5c8$Q3 zyPmkVy_ov4^$obSy@*J7m_cuA|GD|)+ZZR?qviVd;S>Ls9jkCeGDq~L;}`V!e;w|+ z9uEBEcLkv#dvC_qN5+YQE`1ljoTV8Z(zhK%SxfnuyR%m5X3gsM+XjL;^qh)44}!)F zZCa8xsH?r9ld}VKAsm^XhcXm~hCCcII~xKy6;8Atc*PJzc2#Gz`V*We9{{mj7<;WY z*d_)FfvlG)mR}~{esRl^mbr5CNBB4~cuqSH9##pa584tCLx;+e4{W#)+w?~Eu;wFM zbma*l*rUpDni+`Bt_NfIFYvz^0MfG^8}29~9jq6G_}(3(8QuJ&HXJB!E)@`Nju5wC zLo_5obu|axWzG z%dv`i=Mj)y7QehknL5nj`rjG<&-F&r7XaEc)rG_-(m-3|@7;j>-}z4o`TgyM!~MOt zBQzj-1DEo2`;hUU?*GZEr^m+HbRHnohD=-i@L~C{_ZNfoADTX!?I>mL#T;WbX$;m~ z+^l7LX8EG_QDp{F%i|E(-wPO~Zf>e9H+kJZ^8~tGX(62y&*0*K1et6)2;Qu4s6-d24k5<=HU190( zi_?WDD^E!r5Vvg|t;sPp35#k<3X((CHwAHcki}e0E&y>XRhu&Ms_FjlFv3Rxi%u{8QM{;O$o+ok!X##Z4cIAwf zWX1{o`uzRFm(L#}&dfbM?RoW-44NpL-WxR5utKstLY(_vEK@iLQx z3%?4}Kl^l7qV6^Qs)%rifDlvX!rdVeMNN3u(TvKAc{iS=Wq2#jBEeB3!MqXQK;0_L zP9h$fUuYMe`?6g8SV1E4b(+N%cz{HsB&dCHMZiQJ{G=b0IlODE{w=Z#Z zV^|%daju=PPIGuK%mkyP!ZeouUHGq8Xgr)~SQM|J9lcm1aalqX6Xq4n!37fw zC_%L739{988{bLZa^|=iT_>BPyejB?Rm7-a?eb9*Sz~);5V5`O*9E(H(0G=tR;W4f z_%ZM2Adv(Il_RiMsURnOSPf!Q$bN9{<|`W0DR&hey;RC>mhaJvJJv`fGXFS9^l#9% z3=Zx=(lo!Ot_aHp8AYU!^doPxD)8cW}+@ROBj z47+WtKi79dsrt|$JhXpw4jXJ46vzE}W;|xDm|N56SXG9Q=d9Ar1jJrrBTwbwh0xje zm}CE#R_xO}SkmnIY7#2Fq_S?+$88PYiF;tH;UpDjoXH5#>GWO3;&=N|E^*ib+FT9? zVG?c~5-5j`a=B;BzGTE-xj8=Z&bdeR@nibk+_`7aJ(`UEry&y^$ zPZ*zy!us!(zP$2~VE2^~(Q;KM^Q_lo!g75vuh-yyBebHbbFUlYSJTaWvXM-sU`%Q8 zMo^=N4}n#r&yvz5RVymUpYKvBMd7m>j7MYQs%JOU}qC~c-3TE zdt?KyWW|k!g*X2|7LJER^{U z{psm4qxKH{jcL@i>DyFn36j*biF=R8Oo{4Ri_h0&QOr4)nj!G>gcwIO{3F~V;iBE1 zos@Zrxzw<#WU~Ie_A}KR1y$d|R>$;eB<+0SfkIB7ss7e{8PkBL89=^a9|x>BaHk5j zIPL9WXXDuPqm<1+&A3rOaZ=mkwr=o3{vE&7CM5>3IJR8y?2X%;8*st^{!98Q_e!!n zT#9qNB<**uEt#5Rcl-R!w?F*H=|YZP$dAxBDkhCN6)v5(DNtsRikfn0)YUgN zN_cSX`u-qm)M)5K&uf7AN^+Nc2p+)4T8G9kjXZpLnfSabmau6%PD6V&$QITD`K7H8G_m z0k&e)OJ}P|rO9X8Nj;-f*|KNlf@|fsvdT%58v2c3|AFv*n>-mcxD~drpFU%m__5YA zk#ww^G2uip+WX-5hTSBVtsqZclR+FYNzx5P-JslQ*{-MAAM91pLd+D+>YqWyX8i~~ zQ}_G`aG-ltvjIy|c5>IuE??I(p^lE;IVjqay9SY%PtRUsTN{H$GKu%IIC2mif=T`@ zZPCdj|F8%9jdr4K?D>Y~YQxVk*F%S0UJy}2jRui}VRNY;6MdRlL?ZwkMZ7v3dOboh z%-zW^^q^mOP_y+(^E`{d#3Eq7i7*DjsaUG~g;^jok4kR=2A*)0OcyQZ1Y8Bgwy3}?@bK``&*M<@JkeLrG+s|^A z%k`|rQt8%)70ew}Y50EPw7R6a>)}3sciJE?xC~{L3{{4njhFUY-WRp zTemheBDEy^nJwAD^3*)=-)nQk5xwu>`(U*rDuztE&M+YDIz4PnV2+{Wg zYWxMFb>;Z&Vsz9}1-J~b;W>O<4U+A8s{~rt^=&5JUn3sJMX}GE!U(>M>HPZkz&nIu zH@R#3ji>PYUq0{@n3XXvxE=XI4Km&svioWAD^+$Z+dT{&;fuZXJtAEZm`u$3pGf`lJA?^Q#mQ#B!&zY_D?7WUK$KFo zXzB;)rXS<#fiXa(_-)8@Ow#*)s_3|&a1Yf;0Q1;7Xn7pf<`ssHY5=cI^l00?RqQP; z61akgRxkASWuWy&LC$#LY03Vz;MsGqvwgntaw#({uReD zj@oolMMrxo$nWTGetEIF%{gyFCvVCXpO#gbGH`ddc=rObTmR>co-*p!HNiQ|pFx^# Y08g?wl}e?4Ec{V1mko8_Xgfao7r}GFW&i*H delta 3817 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 Y9_%Ru;zRDS0QB#jysBK8jCsKS0k*ha>i_@% delta 15995 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 diff --git a/modular_nova/modules/customization/game/objects/items/donator_plushies.dm b/modular_nova/modules/customization/game/objects/items/donator_plushies.dm index 3eaebcca087a..64d053476c23 100644 --- a/modular_nova/modules/customization/game/objects/items/donator_plushies.dm +++ b/modular_nova/modules/customization/game/objects/items/donator_plushies.dm @@ -935,3 +935,22 @@ "Yeeeessss?", "Helloooooo.", "Don't be such a baby, ribs grow baaaaaaaaaack.", ) + +// Donation reward for bonkaitheroris +/obj/item/toy/plush/nova/donator/commandant + name = "commandant plushie" + desc = "From Cenion's Marketing Team: a cute plushie! A Plushie! Plooshi? Jamlet? Creature!" + icon_state = "plushie_commandant" + inhand_icon_state = "plushie_commandant" + lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi' + righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi' + attack_verb_continuous = list( + "hugs", + "squishes", + "baps", + ) + attack_verb_simple = list( + "hug", + "squish", + "bap", + ) diff --git a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index faa7b4ac0417..506c04e2af4c 100644 --- a/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -915,3 +915,8 @@ name = "Worn Corporate Cloak" item_path = /obj/item/clothing/neck/tattered ckeywhitelist = list("jaklz") + +/datum/loadout_item/toys/commandant + name = "Commandant Plushie" + item_path = /obj/item/toy/plush/nova/donator/commandant +// ckeywhitelist = list("bonkaitheroris") // Asked it to be public From fee2195a10aa7f0550ab88e90e49b8bca1330f08 Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 02:05:51 +0000 Subject: [PATCH 13/14] Automatic changelog for PR #4707 [ci skip] --- html/changelogs/AutoChangeLog-pr-4707.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-4707.yml diff --git a/html/changelogs/AutoChangeLog-pr-4707.yml b/html/changelogs/AutoChangeLog-pr-4707.yml new file mode 100644 index 000000000000..1bfd8c61255b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-4707.yml @@ -0,0 +1,4 @@ +author: "somenetwork" +delete-after: True +changes: + - rscadd: "Donation reward for bonkaitheroris" \ No newline at end of file From 326d9b5c44426da6cc6d19a9d952d1151b974a8e Mon Sep 17 00:00:00 2001 From: "novasector-ci[bot]" <181600888+novasector-ci[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2025 00:45:44 +0000 Subject: [PATCH 14/14] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-4707.yml | 4 ---- html/changelogs/archive/2025-01.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-4707.yml diff --git a/html/changelogs/AutoChangeLog-pr-4707.yml b/html/changelogs/AutoChangeLog-pr-4707.yml deleted file mode 100644 index 1bfd8c61255b..000000000000 --- a/html/changelogs/AutoChangeLog-pr-4707.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "somenetwork" -delete-after: True -changes: - - rscadd: "Donation reward for bonkaitheroris" \ No newline at end of file diff --git a/html/changelogs/archive/2025-01.yml b/html/changelogs/archive/2025-01.yml index e9f32385e850..736db98481ff 100644 --- a/html/changelogs/archive/2025-01.yml +++ b/html/changelogs/archive/2025-01.yml @@ -9,3 +9,6 @@ - qol: made previously required experiments into discounts for a majority of the tech-web, pretty much everything but alien tech, surgeries (to keep the coroners job safe,) fishing, and illegal tech. +2025-01-04: + somenetwork: + - rscadd: Donation reward for bonkaitheroris