nevimer
baf3837ae8
Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29
...
# Conflicts:
# _maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
# _maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
# _maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
# _maps/map_files/tramstation/tramstation.dmm
# code/_onclick/hud/new_player.dm
# code/datums/components/squashable.dm
# code/datums/diseases/advance/symptoms/heal.dm
# code/datums/diseases/chronic_illness.dm
# code/datums/status_effects/buffs.dm
# code/datums/status_effects/debuffs/drunk.dm
# code/datums/status_effects/debuffs/stamcrit.dm
# code/game/machinery/computer/crew.dm
# code/game/objects/items/devices/scanners/health_analyzer.dm
# code/game/objects/items/wall_mounted.dm
# code/game/turfs/closed/indestructible.dm
# code/modules/admin/view_variables/filterrific.dm
# code/modules/antagonists/heretic/influences.dm
# code/modules/cargo/orderconsole.dm
# code/modules/client/preferences.dm
# code/modules/events/space_vines/vine_mutations.dm
# code/modules/mob/dead/new_player/new_player.dm
# code/modules/mob/living/carbon/human/death.dm
# code/modules/mob/living/carbon/human/species_types/jellypeople.dm
# code/modules/mob/living/damage_procs.dm
# code/modules/mob/living/living.dm
# code/modules/mob_spawn/ghost_roles/mining_roles.dm
# code/modules/mob_spawn/mob_spawn.dm
# code/modules/projectiles/ammunition/energy/laser.dm
# code/modules/projectiles/guns/ballistic/launchers.dm
# code/modules/projectiles/guns/energy/laser.dm
# code/modules/reagents/chemistry/machinery/chem_dispenser.dm
# code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
# code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
# code/modules/reagents/chemistry/reagents/medicine_reagents.dm
# code/modules/surgery/healing.dm
# code/modules/unit_tests/designs.dm
# icons/mob/inhands/items_lefthand.dmi
# icons/mob/inhands/items_righthand.dmi
# tgui/packages/tgui/interfaces/ChemDispenser.tsx
2025-11-29 22:49:21 -05:00
Majkl-J
ae0b926948
Holy lord no more please
2024-10-24 03:07:38 -07:00
Majkl-J
50cced00b0
please help
2024-10-24 02:58:19 -07:00
2f5c7f8389
[MIRROR] Icon folder cleaning wave one [MDB IGNORE] ( #22374 )
...
* Icon folder cleaning wave one
* Fixe a merge conflict
* Fixes some more merge conflicts
* Fixes some modular icon paths
* Fixes even more modular icon paths...
Hopefully that's the last of them
* Fixes some merge discrepencies
* More merge issues
* ok
* not ok
---------
Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com >
Co-authored-by: Giz <vinylspiders@gmail.com >
2023-07-13 16:24:33 -04:00
529b8b4464
[MIRROR] Lighting object oddities [MDB IGNORE] ( #21945 )
...
* Lighting object oddities (#76009 )
## About The Pull Request
Fire stacks status effect no longer uses a weakref for the mob light, I
am pretty sure there was no real reason to use a weakref there.
Deleted weird luminescent glow dummy, now it just uses the standard
moblight obj.
Put all /obj/effect/dummy/lighting_obj together in a single file and
added a comment explaining why they exist.
(I severely dislike the /obj/effect/dummy typepath, but I am very much
unsure if just replacing all of them with /obj/effect/abstract would
break shit)
## Why It's Good For The Game
Code organization good
* Lighting object oddities
* Update kindle.dm
---------
Co-authored-by: ChungusGamer666 <82850673+ChungusGamer666@users.noreply.github.com >
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com >
2023-06-20 14:06:48 -07:00
7fbecfe4ff
[FINALLY HERE] Clock Cultist OPFOR bundle ( #20257 )
...
* Adds backend clockcult code (#17136 )
* probably good to go
* Update stylesheet.dm
* revert speech
* shut the fuck up, CI.
* did the wrong thing lmao
* shuttles are good to go
* tick it
* okay lets see how this goes
* axe the event shuttles for starters
* i saved these dw
* probably good for now
* clean up sigil code
* layer fix
* a
* D'oh
* The melbert change I can do on my laptop
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com >
* elementizes
* Update modular_skyrat/modules/clock_cult/code/hint_element.dm
Co-authored-by: Tastyfish <crazychris32@gmail.com >
* Apply suggestions from code review
Co-authored-by: Tastyfish <crazychris32@gmail.com >
* Update modular_skyrat/modules/clock_cult/code/hint_element.dm
Co-authored-by: Tastyfish <crazychris32@gmail.com >
* all good to me
* base vitality nerf and cleanup
* fuck
* fix diveworm innaccuracy
* Update modular_skyrat/modules/cortical_borer/code/cortical_borer_abilities.dm
* Update modular_skyrat/modules/clock_cult/code/actions/_action.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* Update modular_skyrat/modules/clock_cult/code/actions/_action.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* tf3
tf4
* TF4 reviews
* antag datumization and some more bits and bobs
* tgui nits to be picked
* I kind of forgot this shocks the shit out of you
* TODO: test this
* fixes and qol
* post-element cleanup
* whoops
* Apply suggestions from code review
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com >
* Update modular_skyrat/modules/clock_cult/code/actions/whirring_convergence.dm
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com >
* golden's changes
* the cleanup
* upstream fix
* 515
* Update gear_base.dm
* Update _sigil.dm
* lint
* cleanup
* untruth begone
* index
* icon skew
* Update antagonist.dm
* Update trap.dm
* good to go
* CI
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com >
Co-authored-by: Tastyfish <crazychris32@gmail.com >
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com >
* [PROJECT] Integration Cog Scripture (#18687 )
coggers
* [PROJECT] Transmission Sigil (#18684 )
* yuh
* a
* repath
* Update sigil_transmission.dm
* [PROJECT] Tinkerer's Cache (#18705 )
* forgery
* comment
* Update tinkerers_cache.dm
* replica
---------
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* [PROJECT] Interdiction Lens (#18928 )
* adds interdiction lens
* nerf + fix
* guh
* Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* Update modular_skyrat/modules/clock_cult/code/structures/interdiction_lens.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
---------
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* [PROJECT] Ocular warden (#19499 )
* adds ocular wardens
* Update modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* Update modular_skyrat/modules/clock_cult/code/structures/ocular_warden.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* tf4 review
---------
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* [PROJECT] Clockcult outfits (#19500 )
antag up and outfit
* [PROJECT] Replica Fabricator 2 (#18926 )
* updated
* tf4 review
* [PROJECT] Hateful Manacles (#19622 )
* might add this idk yet
* guh
* balance
* Update modular_skyrat/modules/clock_cult/code/scriptures/servitude/hateful_manacles.dm
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
---------
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
* [PROJECT] Vitality Sigil (#19625 )
* adds the vitality sigil
* balance, fix
* a
* [PROJECT] Clockwork Marauder (#19677 )
* woe, omen upon you
* shield
* melbview
* [PROJECT] Outpost of Cogs (#19696 )
* adds mini-reebe
* melbert review and some touches
* static
* props n shit
* coggers
* less cancer
* Update modular_skyrat/modules/clock_cult/code/turf.dm
* [PROJECT] Refactors some clock cult code (#19644 )
refactors some scripture code
* [PROJECT] Clockwork Armaments (#19663 )
* clockwork armaments
* a
* a^2
* [PROJECT] Removes Clock soul (resprites) (#18945 )
* adieu 2018 sprites
* finally got around to this
* [PROJECT] Kindle (#19501 )
* bullshit stun hand revengance
* whoops
* [PROJECT] Prosperity Prism (#19877 )
* adds the prosperity prism
* a
* w2
* w3
* Update tinkerers_cache.dm
* Update _powered.dm
* [PROJECT] Clock balance & fixes (#20096 )
* whoooo boy this is a lotta changes
* slab spell
* clarity
* smol bug fixes
* a few bits and bobs
* fixes ci
* a
* CI fixing
---------
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com >
Co-authored-by: Tastyfish <crazychris32@gmail.com >
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com >
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com >
2023-04-02 15:03:54 +01:00
nevimer