a263a81774
Migrate whetstone to the new attack chain. ( #32288 )
...
* Migrate whetstone to the new attack chain.
* Apply suggestions from CRUNCH review
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
---------
Signed-off-by: Alan <alfalfascout@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com >
2026-07-24 19:30:45 +00:00
PollardTheDragon and GitHub
7796f6a7fe
Adds cult scaling for lower population ( #31765 )
...
* Cult team size
* Adds cult scaling for lowpop
* Oops
* Constants make me physically ill
* Linters
* Cult budget scales with number of roundstart cult
* Adjusts methodology
* Revert "Adjusts methodology"
This reverts commit 75b7695ba0
2026-06-02 19:52:11 +00:00
203105788c
[IDB Ignore] Heretic: The Mansus Re-Opened ( #30738 )
...
* fixes
* fuck my stupid chungus life
* Minion limit, heal fix, dead sac fix
* cooldown, no sacrificing star gazer or ascended alive heretics
* blade debuff
* oopsy
* Update tgui.bundle.js
* map diff bot what ya doing
* fuck that chat spam
* lets heretic armour hold a haunted longsword
* why not it makes sense
* do_after
* god I hate this bullshit
* other lewc stuff
* push
* heretic id card fix
* she tg on my ui till I css
* yes
* spent
* fix / ipc buff (real)™️
* moderate again
* revert
* no reserve
* bringing up to master
* update map files to master
* didnt replace centcomm
* beginning some rebalancing
* aggressive spread tweaks
* lots of tweaks and fixes
* trying to un-key the maps
* maybe this time
* this time????
* oops
* sql fix
* basicmob conversion
* paintings! and a critical influence fix
* rust + tweaks
* monster tweak
* small change
* removing this
* more tweaks. no more dusting
* added some examine_more
* flower seeds
* various tweaks. more to come
* no more conduit spacing
* fixed some dumb stuff
* silly stuff
* its always prettier
* bugfixes and linters
* linters, wow
* oops
* bah
* linter
* fuck you
* temp check
* hidden influence drain
* influence visible message
* tweak fix
* void cloak bugfix
* small fixes
* fixes
* do_after_once broken
* fixes and tweaks
* heretic blade potential fix + sacrifice changes
* batch of fixes
* tiny tweak
* rebuilt TGUI
* no greentext + rerolls
* logging + bugfix
* unused var
* small fix
* various fixes
* comment
* projectile change
* tgui rebuild
* tgui bundle redo
* rune issue solved
* influence visible now
* fix ui reloading
* new moon ascension + fixes + icons
* tweaks, species sprites
* tgui rebuild
* small tweak + linter
* harvester icon tweak
* spans
* fixes and tweaks
* caretaker nerf + tweaks
* potential fix for knowledge
* roller fix
* mad mask
* Update tgui.bundle.js
* void phase tweak
* Update tgui.bundle.js
* misc tweaks
* fix heretic not retargeting correctly with cryo
* simplify logic
* this is better
* lots of fixes and tweaks
* Update tgui.bundle.js
* linter
* linter
* fireshark and greyscale insanity
* fish
* Update tgui.bundle.js
* linter
* linter
* tgui
* no window shopping
* fish fix
* tgui rebundle
* moon smile runtime fix
* various fixes
* sacrifice fixes
* insanity is easier now, madness mask changes.
* bugfixing + teleport change
* linters + tweaks
* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/heretic/status_effects/mark_effects.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Paul <pmerkamp@gmail.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2026-01-27 20:36:52 +00:00
kyunkyunkyun and GitHub
b0463d3c83
Convert most spans to defines ( #31080 )
...
* spanish?
* aaaagain
* keep maptext
* Update robot_items.dm
* Update span_defines.dm
* compiles
* Update silicon_mob.dm
* compile
2025-12-13 23:55:48 +00:00
0cfe0594be
Refactors slaughter, shadow, and pulse demons to basic mobs ( #30660 )
...
* Refactors slaughter, shadow, and pulse demons to basic mobs
* Linters
* Fix
* Projectile changes
* Ensures demons speak common
* Update code/modules/mob/living/basic/hostile/demons/demon_powers.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-11-25 19:47:12 +00:00
kyunkyunkyun and GitHub
f96b26b75a
/obj/item/projectile --> /obj/projectile (#30411 )
...
* yers
* vars
* map changes
* some comments (clearly not stolen from items)
* fix component
* summary
2025-11-12 10:23:20 +00:00
CRUNCH and GitHub
4784679311
Adds Cult Tables ( #30561 )
...
* cult
* Update sheet_types.dm
* pylon
2025-10-07 17:52:47 +00:00
32b127ebb2
Add better-fitting hoods for monitor heads. ( #30200 )
...
* Add better-fitting hoods for monitor heads.
* Fix some icons not animating properly, thanks IconDiffBot2!
* Here you go
* Incorporate linter feedback.
* Re-order the checks slightly to make the hoods render.
* Defluff
---------
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-09-22 13:15:35 +00:00
warriorstar-orion and GitHub
3208049a8a
Attack chain migration: structures. ( #30365 )
...
* Attack chain migration: structures.
* whoops
* wth
2025-09-14 19:21:36 +00:00
kyunkyunkyun and GitHub
8821ab9a66
Updates a couple of /obj/item variables ( #29829 )
...
* compiles checkpoint
* fix some
* updatepaths
* fix
* rrr
* linters
* fiexs
* icon fixes
* plasmemes
* fix
* fix
* fix bit more
* fix
* well
* cleanup
* fix glasses layer
* conflict
* fuck gun code
* fixes
* fix
* fixes to energy guns
* review
* conflict
* support that 1 unathi pixel
* fix
2025-09-14 15:23:56 +00:00
kyunkyunkyun and GitHub
10f2e67e65
Cleanups and tweaks observer code ( #30250 )
...
* observer cleanup
* this
* bit more
* Update tgui.bundle.js
2025-09-05 05:54:22 +00:00
Contrabang and GitHub
7125897ebb
Refactors Mousepointers + Code improvements ( #29960 )
...
* blah
* tweaks
* refactor
* awesome
* put everything in mouse_icons folder
* make spells work
* update twin
* tweak
* woop woop
* remove dynamic mousepointers
* bam
2025-09-02 20:47:56 +00:00
626eaaeb79
Removes british spelling of armor from armor_penetration vars ( #30104 )
...
* spelling
* manually rename last armour pen
* Update code/game/objects/obj_defense.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
* Update goldgrub.dm
---------
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-09-01 04:27:52 +00:00
ef41677463
Port mob cooldown actions and AI behavior. ( #29924 )
...
* Port mob cooldown actions and AI behavior.
* fix lint
* fix missing override args
* Update code/_onclick/click.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/_onclick/click.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/datums/actions/action.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/__DEFINES/ai/blackboard_defines.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* remove unused defines
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-08-07 15:55:52 +00:00
warriorstar-orion and GitHub
56f4960ed4
refactor action buttons ( #29416 )
...
* refactor action buttons
* fix cult spell charge overlay
* lewc review
* update for a/mhelp buttons and xenobio organs
* update for minebot
* properly create button each time
* directly add/remove unavail overlay for reasons
* lewc review
2025-07-28 19:13:28 +00:00
Contrabang and GitHub
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
PopeDaveThe3th and GitHub
bdf4863757
wololol ( #28943 )
2025-04-26 14:14:47 +00:00
warriorstar-orion and GitHub
a3280c6464
pull last attacker data to atom level ( #28824 )
2025-04-03 14:09:39 +00:00
202249a137
migrates /obj/effect to the new attack chain ( #28066 )
...
* the great migration
* pleasing the linter
* whoops
* smol fixes
* review
* hallucination attack proc
---------
Co-authored-by: Toastical <toast@toaster.com >
Co-authored-by: Toastical <toastical@toaster.com >
2025-02-26 09:45:18 +00:00
ff4277d5e3
Removes command from being eligible for round start antagonist ( #28173 )
...
* Off with the heads
* Apply suggestions from code review
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Actually adds the restrictions to dynamic
* Makes telegun hijack only for scientist
* Update code/game/gamemodes/cult/cult_mode.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-02-11 11:40:44 +00:00
4bdd8a06ba
[LORE] Bluespace Lore Pass Pt. 1 ( #27809 )
...
* when the space is blue
* Update bio_chip_fluff.dm
* Update wormhole_jaunter.dm
* Update magazines.dm
* Update bags.dm
* Update magazines.dm
* Update dance_machine.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update closets.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
---------
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
2025-01-23 05:21:16 +00:00
a8a17134eb
Makes some loops use GLOB.ai_list instead of other various lists ( #27916 )
...
* Thngy
* Update code/modules/mob/living/silicon/ai/ai_mob.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-01-12 10:09:30 +00:00
60c00ce0d5
adds the proteon orb. (heretic requirement) ( #27705 )
...
* adds the proteon orb.
* oops
* Update code/datums/components/ghost_direct_control.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* revert that
* Update code/game/objects/structures/monster_spawner.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* lewcs stuff
* Update code/game/objects/structures/monster_spawner.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update monster_spawner.dm
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-01-10 19:11:53 +00:00
warriorstar-orion and GitHub
0eafad8475
Refactor /mob/unEquip. ( #27720 )
...
* Refactor /mob/unEquip.
* fix things found in testing
* more fixes from testing
* fix removal of hooded suits
* fix flayers inability to deploy swarmprod
* fix changeling blade activation
* unnecessary parens
* pass default unequip args to proc overrides
* fix belts being able to forceMove into full hands
2025-01-10 01:58:35 +00:00
chuga-git and GitHub
1ee68334bf
adds NCT to antag blacklists ( #27811 )
2025-01-03 00:00:52 +00:00
7bbebbb23f
Ports Anti-magic from TG. ( #27560 )
...
* the rest of the fucking owl
* OK hands need work but otherwise good
* fuck time out fix vampire after
* temporary codersprite do not merge this lmao
* codersprite up
* pause, time out
* deploy the antimagic
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* Update code/datums/status_effects/buffs.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/gamemodes/wizard/magic_tarot.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-01-02 08:36:07 +00:00
79bad427c8
Movement cross/uncross implementation. ( #26762 )
...
* refactor: Movement cross/uncross implementation.
* wrong var name
* fix unit tests dropping PDAs into nowhere
* Add documentation.
* remove unused constants
* say which procs are off limits
* fix simpleanimal z change runtime
* helps not to leave merge conflicts
* kill me
* fix typecast
* fix projectile/table collision
* treadmills don't cause MC to crash anymore
* connect_loc is appropriate here
* fix windoors and teleporters
* fix bonfires and clarify docs
* fix proximity sensors
Tested with sensors in crates, sensors in modsuits
Tested new proximity component with firing projectiles at singularity
Tested new proximity component with portable flashes
Tested new proximity component with facehuggers
* lint
* fix: polarized access helper false positives
* Revert "fix: polarized access helper false positives"
This reverts commit 9814f98cf689928798+lewcc@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* lewc review
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* burza review
* fix bad args for grenade assemblies
* Update code/__DEFINES/is_helpers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: DGamerL <daan.lyklema@gmail.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2024-12-21 08:07:44 +00:00
warriorstar-orion and GitHub
525c68d617
Attack chain, initial setup. (pull *immediately* for *any* TM issues) ( #26834 )
...
* refactor: Attack chain, initial setup.
* migrate curtain to make dreamchecker happy
* update thurible
* don't call attacked_by separately for legacy attack chain
* remove duplicate proc
* condense similar code, put allowances for legacy code in new procs
* update docs, include diagram source
* add comment on how to update diagram
* fix admonition
* mindflayer updates
* remove commented out code
* clarify all steps
* after_attack should be overridable
* whoops
* retrofit recent changes
* duh, can't restrict this yet because of tool_acts
* i hate ore bags with the fire of a thousand suns
* return correct value for object attack logic
* Various cleanups.
We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.
I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.
* simplify some argument names
* fuck it
* make it do the thing
* Rename CI module call
* Prove that CI works
* improve test output
* aaand fix it again
* fix curtain tool interactions
* fix compile error
* fix compile error
* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
chuga-git and GitHub
32b97afbec
fixes some bad html ( #27481 )
2024-11-29 10:46:51 +00:00
d90a70ecda
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag ( #26743 )
...
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Chap <erwin@lombok.demon.nl >
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl >
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-11-13 13:02:29 +00:00
Henri215 and GitHub
b38c4bbd4c
A few description grammar fixes ( #27134 )
...
* Double spaces
* more space and misspelling
* Fixing punctuations
* Not now
* double dots
* Apply suggestions from code review
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-11-10 13:38:28 +00:00
0f717d660a
Adds CI to forbid some istype(src) checks. ( #26980 )
...
* first set of changes
* the last checks
* actually builds
* Update code/modules/surgery/organs/subtypes/standard_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update tools/ci/check_grep2.py
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* 1 fix (cigarettes) and better encapsulation in files
* yeeep
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-11-06 12:56:36 +00:00
dc7d24c28c
Adds the bluespace anchor cybernetic implant ( #26978 )
...
* Anchor? I hardly know her!
* biochip code my hated
* yeah that's fair
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-10-25 18:20:45 +00:00
793efb00df
Bola no longer gets thrown even if you already are bola'd ( #26909 )
...
Co-authored-by: Adrer <adrermail@gmail.com >
2024-09-26 14:21:50 +00:00
Daylight and GitHub
965b42bf51
[FIX] Cult Shadow Shackles can now cuff people who are missing an arm. ( #26707 )
...
* Copies the requirements from handcuff code
* This proc is never implemented
* Removes unused procs
2024-09-11 17:34:20 +00:00
PopeDaveThe3th and GitHub
58c7fa9a0d
Fairly Sizable Fed Lore Drop ( #26600 )
...
* the fedening
* Federation -> TSF
* Update outfit_admin.dm
* Update outfit_admin.dm
* i forgor
* few more
2024-09-03 13:04:56 +00:00
bef66785ce
Makes various things return qdel hints on initialization ( #26607 )
...
* makes apcs destroy properly with a null area
* starts cleanup of initialize failures and hint returns
* Revert "makes apcs destroy properly with a null area"
This reverts commit 9a9175cd3789928798+lewcc@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-08-28 23:57:15 +00:00
Kenionatus and GitHub
777910d6d2
replace magic numbers related to emp and explosion severity with defines ( #26495 )
...
replace even more magic emp and ex numbers
2024-08-18 03:11:22 +00:00
567fd0ae35
Stops runtime in cult spirit realm rune when observer doesn't have a mind ( #26473 )
...
* sanity checks observers without minds being trait checked
* Update code/game/gamemodes/cult/runes.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
* Update code/game/gamemodes/cult/runes.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-08-13 09:48:04 +00:00
6837ea7333
Caterpillars and Nymphs that evolve no longer provide blood to vampires and cannot be culted ( #26174 )
...
* Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires.
* Improves comments and changes the trait name.
* Update code/__HELPERS/trait_helpers.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
---------
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-08-03 00:07:33 +00:00
HMBGERDO and GitHub
5234b6386b
Revert attacked_by changes ( #26330 )
...
* t checkout master
Revert "Fixing fulton pack not working (#26153 )"
This reverts commit 67353fd62a#25771 )"
This reverts commit 9ea58e1e33#26197 )"
This reverts commit cd88b3de88
2024-07-31 10:00:00 +00:00
cbeedfca9f
Parrying Refactor, Adding Parrying to Select Two-handed Weapons: Parry This You Filthy Casual! ( #26043 )
...
* Refactors parrying and how parrying is handled. Also gives most of the melee wizard weapons parrying as well as most two handed weapons.
* Forgor the blood spear :)
* Renames `special_parry_condition` to `requires_two_hands`
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Update code/datums/components/parry.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* applies suggestion from @lewcc
* Removes the two handed requirement from cult spear as per @Qwerty's request
* Apply suggestions from code review (1/2) from hal
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
* Apply suggestions from code review (2/2)
* ...accidentally removed an icon in `energy_melee_weapons.dm` when I deconflicted stuff. 💀 ready for review.
* Again, variable added back during deconflict. issues resolved.
* Update code/game/objects/items/weapons/shields.dm
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-30 12:33:02 +00:00
cb4d709c78
Fixes some extraneous spacing in some messages ( #26222 )
...
* clears a bunch of spaces
* oopsie daisy
* Update code/modules/food_and_drinks/food/customizables.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-20 00:15:21 +00:00
ec88636e6c
Cyborg Damage, Movement, and Power Overhaul ( #25252 )
...
* Adding defines
* More signals for external power
* Gets the reboot working
* renaming a proc
* config stuff
* Working on cyborg movement
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
* IOSYS where'd you come from
* begon return 0
* VTEC caps slowdown
* Adjusting EMPs
* Funny arm is GONE
* Oh yeah regenerating stamina might be a good thing
* Forgot you could uninstall vtec
* icon machine broke
* Cell-less borgs can enter chargers to stay powered
* oh that was almost bad
* Fixes some logic
* its a surprise tool that will help us later
* Adjusting some numbers
* Adds a sound to go along with the text alarm
* dead things can still charge
* Another logic error
* Xenos too
* sorry linter
* fixes CL
* Slightly more slowdown on stam damage
* neurotoxin won't stun
* SOUNDS!
* 3 flashes to stun instead of 4
* Slightly longer stun
* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK
* Keep borgs stunned forever
* Power loss is more dangerous
* Adds a stamina hud to borgs
* Cyborgs now heal up properly
* Removes an outdated comment
* Replacing parts works better now
* EMPs disable components for a brief time
* More missed rebalances
* When you forget to remove debug messages
* WHAT
* Cult magic works + borgs can be silenced
* 2 flashes to stun, flashes confuse now
* Update code/game/objects/items/devices/flash.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Abductors can stun borgs
* Watcher/cyro rays deal stam to brog
* Fixes a rounding error when healing borgs back to full HP
* Fixed span
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Fixed whitespace
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Guard clausify
* Indents a message
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/component.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* Update code/modules/mob/living/silicon/robot/robot_damage.dm
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
* that's not what stat does
* No more hardcoded speed, don't TM this branch
---------
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com >
2024-07-09 17:44:50 +00:00
bc303a85bd
Adds cult action bar ( #26052 )
...
* cult actions list
* moved blood spear a little to the side
* pixel offset
* Update code/__DEFINES/action_button_defines.dm
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
* review
* eh, why not
---------
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com >
2024-07-01 23:14:45 +00:00
Gaxeer and GitHub
32e46c02aa
refactor: rename action button appearance related variables and procs to be clearer ( #25658 )
...
* refactor: make action appearance creation more straightforward
* some adjustments
* fix: adjust action icons to refactor
2024-07-01 02:29:31 +00:00
340d8a3731
Update to restraints ( #25831 )
...
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update humanoid.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update human_mob.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update status_effects.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update neutral.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update blood_magic.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update abduction_gear.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update abduction_gear.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items/weapons/handcuffs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items/weapons/handcuffs.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/objects/items.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/game/gamemodes/cult/blood_magic.dm
Woops.
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update items.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
The consequences of my actions
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update humanoid.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update clothing.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update human_mob.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update code/modules/mob/living/carbon/human/human_mob.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update carbon_procs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
* Update handcuffs.dm
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
---------
Signed-off-by: Faron <171642577+FaronCD@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-07-01 02:14:52 +00:00
9ea58e1e33
Cult magic attacks and attacks on stun mark can now be blocked by shields ( #25771 )
...
* cult attacks and hands blocked by shields
* logic fix attempt 1
* old shit
* Update code/game/gamemodes/cult/blood_magic.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
* Update code/game/gamemodes/cult/cult_items.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
---------
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-06-29 18:28:26 +00:00
43b7fa5ed9
Gargantua Blood Rush now removes bolas ( #25989 )
...
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints
* comment tweaks, prevents blood rush from being used when buckled.
* Update code/modules/mob/living/carbon/carbon_procs.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
---------
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-06-28 03:16:55 +00:00
Qwertytoforty and GitHub
c7d6e83d7e
fixes block uptime being 33% instead of 50% ( #25917 )
...
* matt I'm shooting you (not really but)
* also these ones
* fixes cqc
2024-06-20 11:38:30 +00:00
