Kyani
b1b3eee1dc
Adds wizard item: Plague Talisman ( #28150 )
...
* first bits
* moving to an item
* progress
* more.... progress?
* it works! now sprites
* sprite + bugfixing
* renaming
* removed spacing
* upgraded to advanced kingstons
* added examine text
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/godhand.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/spellbook.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update zombie_spells.dm
* made the talisman smaller
* this was leftovers. Deleted
* alerts zombies to their disease
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* updated to new attack chain
* I think this will work?...
* maybe this time + bugfix
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/carbon/examine.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixed some reviews
* new sprite!!!!
* reworkin it
* oops spacing
* more rework. claws dont work no mo
* FINALLY
* fixed indent
* fixed an exploit + comments
* forgot to save this
* beginning rework
* Update wizard_diseases.dm
* Update wizard_diseases.dm
* finished the diseases
* removed unused proc
* removed brainrot
* misc fixes
* adds diseases to blacklist
* fixed the empty box
* silent already exists, bah
* reworked, per contra
* more fixing
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/zombie_virus.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/antagonists/zombie/zombie_spells.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* small tweaks
* fix + tweak
* rework + revive tweak
* tweaks
* tweaks
* slight tweak
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* review fixes
* Update artefact.dm
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/wizard/artefact.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/diseases/wizard_diseases.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* small tweaks
* lower regen. why was this so high
* linter
* linter
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-08-06 19:53:27 +00:00
warriorstar-orion
b5ac86c818
Add new line decals. ( #29907 )
...
* Add new line decals.
* undefs
* remove redundant alpha
* fix lint
2025-08-06 06:01:09 +00:00
Charlie Nolan
8ffefd8777
Move all the non-weapons out of code/game/objects/weapons ( #29820 )
2025-08-06 01:37:56 +00:00
PollardTheDragon
3b0a9c4381
Converts a whole lot of friendly mobs to basic mob AI ( #29815 )
...
* Butterflies, Cockroaches, Slothes, Snakes, Penguins, and Bunny Basic Mobs
* Lizards too
* Oops
* Lizard emote keybind
* Updatepaths
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Moved lizard emote to basic_emotes.dm, simplified hide action
* New linters
* Merge conflict resolution
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-08-06 01:17:13 +00:00
PopeDaveThe3th
8974bf7c30
[LORE] Cybersun Lore Polishing + Small Implant Updates ( #29350 )
...
* sun
* spelling mistake
* changes
* a
* who up
* review
---------
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
2025-08-05 15:24:48 +00:00
YoursTrulyHollow
072bebd088
Drip expansion: Syndicate garment bag ( #29764 )
...
* repair droid sprite update
* biochips
* syndie drip 1
* Update code/game/objects/items/weapons/storage/garment.dm
Indeed, my apologies
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/glasses/glasses.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/head/beret.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* Update code/modules/clothing/neck/cloaks.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
* merge conflict resolve attempt 1
* Merge conflict resolve attempt 2
* mergre conflict RESOLUTION attempt 3
* Revert "mergre conflict RESOLUTION attempt 3"
This reverts commit 06e0f77564 .
* Merge conflict resolution attempt 4: hooks edition
* maybe i shouldn't have commented that one thing out
* updated garment bag description, removed stashed change
* removed garment bag contents stashed changes
* removed syndie beret stashed changes
* removed syndie cloak stashed changes
* fixing my fuckup part 1
* fixing my shit part 2
* fixing my shit part 3
* fixing my shit part 4
---------
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com >
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-08-02 05:27:06 +00:00
PollardTheDragon
97d72d6e22
Converts Feral Cats, Killer Tomatos, and Non-Demon Creatures to Basic Mobs ( #29785 )
...
* Converts Feral Cats, Killer Tomatos, and Non-Demon Creatures to Basic Mobs
* Updatepaths
* Adds ventcrawling target finding behavior.
* returnPipenet()
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* New Linters
* Fixed DME
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2025-07-31 06:00:51 +00:00
warriorstar-orion
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
Burzah
18573ef254
Tgui v6 ( #29342 )
...
* [TGUI v6 Project] Remove `context` (#29086 )
* [TGUI v6 Project] Remove `context`
* I forgot I had to do that.
* [TGUI v6 Project] Move to React (#29090 )
* It compiles
* Last Inferno uses
* all works now
* Fixes
* [TGUI v6] Changes files extensions for interfaces from .js to .jsx, Deprecates Inferno State Hooks (#29094 )
* Initial Commit
* Apply suggestions from code review
trust me bro
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com >
* [TGUI v6] Replaces babel with swc, fixes realtive paths on a few files, new build (#29100 )
* Initial commit
* Build
* webpack config and errors and rebuild
* export routingError, hopefully
* fix pda app routing
* pass current tab index to tab headers and content in nanobank
---------
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
* fix dna modifier bluescreen and library computer tabs (#29108 )
* TGUI parity with TG
Need to fix a bunch of things...
* Implement TGUI payload chunking backend
https://github.com/tgstation/tgstation/pull/90295
* Filx chan bottom scroll. Again
* Fix TGchat focus
* Fix rounding
* Fix inputs
* Upgrade deps
* More fixes
* Fix chat lineHeight
* Fix NanoMap
* Update `tgui-core`
* fix autolathe
* fix airlock electronics
* fix intercom
* fix compost bin height
* Fix chat preferences
* Move to TSX without types :clueless:
* test tiny meet your new brother test tgui
* Fix RCD
* fix stackcraft
* fix up beakercontents
* Fix MODsuits
* fix seed extractor
* Merge branch 'tgui-v6' of github.com:ParadiseSS13/Paradise into tgui-v6
* fix holodeck
* fix cookbook pda app
* fix remaining useState args
* Fix DNAModifier
* Fix Sleeper
* Fix SupermatterMonitor
* Remove `vitest`
* Update dev-server
* Fix `IconStack`
* Correct margin
* bundles, please don't break
* prettier
* Revert "Remove `vitest`"
This reverts commit 0609006abb .
* Re-add tests
* Prettier
* fix maplint for test_tgui
* TGchat shine effect
* TGUI Rebuildo
* Fix broken tabs, search boxes, sortable tables, and others (#29450 )
* Replace KitchenSink theme state with a React context
* Remove last usage of useLocalState
* Rebind unbound useState calls
* Build and update /tg/ui
* Reformat /tg/ui
* [ci skip]
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
* Ports #29217 to tgui v6. Added tgui-setup to CI builds (#29787 )
* Add tgui-setup to build scripts
* Fix CORS issue
* Build and update /tg/ui
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
* Add one missing word to comment
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* fix law manager
* Removes dangling references to `context` (#29793 )
* Removes dangling references to `context`
* Build and update /tg/ui (#25 )
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* fix messenger and atmos scanner
* swap out line break in examinate
* fix powermonitor
* Bump tgui-core from 3.1.5/3.1.4 to 4.3.4 (#29799 )
* Bump tgui-core
* Build and update /tg/ui (#28 )
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* Fixes additional examine text
* oopsie
* Small tgui v6 fixes (#29801 )
* Remove flow
* Miscellaneous fixes
* Miscellaneous fixes
* Moved properties placed on the wrong element
* Migrate removed CSS attributes in JSX
* Build and update /tg/ui (#27 )
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* fix carbon examine
* fix robot examine
* fix lint
* improve SMES appearance
* fix camera console name order
* more newline fixes
* fix boolean modal cancel not working
* fix random disabled access in RCD
* point tgui to correct passthrough verb names
* Fix missing 0 option for ERTs. (#29819 )
* fix newlines in damage flavor
* Revert all changes related to newlines in DM
* fix the actual thing that was wrong with newlines
* fix ERT manager deny input
* [tgui-v6] Makes Agent Card UI more aesthethic, fixes input fields, fixes minimum age slider (#29832 )
* agent card fixes and tweaks
* tgui bundle
* Reformat /tg/ui (#33 ) (#29838 )
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* restore camera console list appearance
* fixed pai ui paths (#29867 )
* /tg/ui fixes no. 3 (#29868 )
* Remove IconStack styles that conflict with styles added in tgstation/tgui-core#203
* Fix minesweeper icon
* DNA Modifier fixes
* Fix alignment of icons in PDA games menu
* Expand chem dispenser
* Fix pAI interfaces
* Build and update /tg/ui
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com >
* teleporter fix, bundle changes, test
* /tg/ui fixes no.4 (#29877 )
* Fix translucent buttons
* Remove stories already present in tgui-core
* Make voting choices not transparent
* Build and update /tg/ui
* Fix size of set ringtone in PDA messenger
* Fix crew monitor highlight colors
* Fix ReagentsEditor search. Small style fixes
* tgui-say radio prefix has special color again
* Expand chameleon mask a little
* Fix search in chameleon mask
* Make list input modal slightly taller
* [ci skip]
* Build /tg/ui
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
---------
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Aylong <alexanderkitsa@gmail.com >
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com >
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com >
2025-07-27 23:23:20 +00:00
Contrabang
a57a8b8c40
Adds CI to error on unnecessary variable modification ( #29861 )
...
* begin the burndown? (y/n)
* okay update requirements?
* change the error name
* there we go
* tweak
* first bit of the burndown
* more
* burndown complete
* return the exit code!
* review
* Revert "first bit of the burndown"
This reverts commit 34155bd991 .
* fix
* fixes
* last fix
* remove deprecated avulto stuff
2025-07-27 22:26:13 +00:00
Contrabang
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
Burzah
8b525382fa
initial commit ( #29879 )
2025-07-26 14:34:27 +00:00
Christasmurf
0332d0dbfd
Paramedic Drip + some tweaks ( #29766 )
...
* code stuff
* icon stuff
* forgor the corgi
* absolutely beefed it
* old vest code removal
* wardrobe removal from maps
* frick and frock
* update path script
2025-07-26 05:57:31 +00:00
PollardTheDragon
b33f74594a
Converts space bears, space carp, and space bats to basic mobs ( #29775 )
...
* Bears and bats.
* Carp
* Comments, file locations
* Linters!
* Moved initial emotes for basic mobs to a component
* Linters
* Adjusted emote chance for space bats
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Updatepaths
* Apply code review suggestions
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2025-07-26 05:53:00 +00:00
Toastical
2d46829ceb
Fix cyborg geiger counter not detecting radiation and migrate geiger counters to new attack chain ( #29753 )
...
* remove rad_protect_contents from cyborgs
* Revert "remove rad_protect_contents from cyborgs"
This reverts commit 8ec9936962 .
* move redirect_rad_act to cyborg geiger counter activate_self
* fix fixing emagged geiger counters
2025-07-24 22:23:45 +00:00
Arthri
4016c25199
Allow mining charges to be stored in explorer's webbing ( #29789 )
...
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
2025-07-24 19:56:00 +00:00
Charlie Nolan
f8d5490731
[s]Modular painter fix. ( #29853 )
2025-07-24 17:45:31 +00:00
Toastical
e50df3c084
Migrate Rapid Cable Layer to new attack chain and fix inhands not getting updated ( #29840 )
...
* migrated rcl to new attack chain
* improved messages
2025-07-24 14:31:05 +00:00
PollardTheDragon
ded67b061b
Adds Buildable signs ( #29702 )
...
* Attack chain and refactor
* Adds Buildable Signs
* Writing fix
* Updated sprites - better sprites. Thanks Exusa
2025-07-24 12:46:19 +00:00
CRUNCH
b404a985ab
Expands the Farragus Quantum Network ( #29650 )
...
* Update cerestation.dmm
* TELEPORTATION!!!!!
* Update cerestation.dmm
* Update cerestation.dmm
* prototype telepad network
* Update cerestation.dmm
* e
* Update teleporter.dm
* Update teleporter.dm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update cerestation.dmm
* Update teleporter.dm
* I fucking hate teleporter code
* Update cerestation.dmm
---------
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-07-23 18:30:29 +00:00
kyunkyunkyun
75202c986e
Fix and refactor of chainsaws ( #28893 )
...
* code improvements
* linters
* oh
* Update spellblade.dm
* Update spellblade.dm
* Update melee.dm
* melee's death
* update paths
* Update code/game/objects/items/weapons/melee/melee.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
* fix icon states
---------
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-07-23 17:32:47 +00:00
CRUNCH
175cfa60a1
The Smoking Expansion DLC ( #29674 )
...
* Creation
* refinement
* so many icons aghhhh
* The Revival
* e
* it continues (again)
* Lots of progress!
* I hate species sprites so much
* fuck
* Update fancy.dm
* Update fancy.dm
* Update cigs.dm
* attack log
* Abstract cigarette
* Update fancy.dm
2025-07-23 17:32:09 +00:00
PollardTheDragon
05791861b7
New PVE Major Midround: Demonic Incursion ( #29053 )
...
* Initial commit. Event.
* Started converting mobs to basic mobs. Migo and Creature. Needs aggressiveness AI
* Makes CI happy
* Fixes some file names
* Ticks files
* Fixes file again
* Update code/modules/events/demon_incursion.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Announcement sound, spawn adjustments
* Reduced spread when portals multiply
* Elite spawns when portal count gets high
* Fixes missing comma
* Converted migo, blank, and most of hellhounds to basic mobs. Added new controllers and behaviors
* Fixes
* Linters!
* Faithless moved to basic mob
* LINTERS
* Makes skeletons basic mobs
* Fixes, Ranged Attacks, Ranged variants of nether mobs
* Handles portal expansion chance
* Linters
* Fixes mobs not breaking shit
* Fixes ranged attacks
* Fixes ranged attacks
* oops
* Another oops. No config changes are needed here
* Twenty percent chance that a nether mob is a grappler
* Dimensional tear fixes
* Adjusts awaken distance for hostile mobs, makes variable melee attack rate for basic mobs
* Variable initial spawns, variable spread rates.
* Whole lot of fixes from merge, hellhound completion
* Updated lavaland winter biodome
* Makes basic mobs able to hurt other mobs
* Makes spawners properly rally basic mobs to beat up the attacker
* Extra line
* Removed comment
* Makes hellhounds stop resting when attacked or when they find a new target
* Fixed initial portal spawn amounts
* Borgs now affected by basic mobs
* Nerfs portal spawn rate, nerfs portal integrity, nerfs portal max mobs
* Grapplers now teleport to missed turfs
* Removes duplicate notices
* Buff portals a small bit
* Makes nether portals no longer RR - the body is now recoverable from the blank it became
* Makes portals layer above mobs
* Removed excess ranged attack var
* Changes list for determining start count to rely on mobs with client instead of all clients
* Nerfs portal max mobs
* Portals can no longer spread to within 3 tiles of another portal except on initial event start
* Adjusts target portal count for big mobs
* Spawners now properly remove nest values of basic mobs
* Portals now glow an evil red. When portals are destroyed, 50% chance per mob to slay the mob
* add prowling and return to home behaviors
* cut this down
* be a tiny bit smarter
* Some code cleanup
* Removes hostile base type, removing excess code
* Gives /obj/ a basic mob attack handler. Fixes turrets
* Gives basic mobs a HUD
* Fixes skeleton death flag
* Adjusted initial spawns
* Incursion portals now slowly convert turfs, up to range 3 of them, to hellish flooring
* Increases reward per destroyed portal
* Makes the final portal of an incursion play a sound on destruction, couple portal fixes
* Fixes basic mob xenobiology interactions
* Non-shit portal sprites
* Adds hostile machine element, mobs now actively target turrets and emitters
* Properly gibs things when they should gib
* Linter fix
* Portals now layer under living mobs but over dead ones
* Adds blackbox checking for demon incursion portal counts
* Increases mob sight range slightly to account for widescreen, adds alt-color for grappler, delays incursion announcement a bit more
* Portals now are more likely to spread the less there are
* Incursion portals now repair themselves after not being damaged for some time
* Grilles now shock basic mobs
* Portals will now clean up basic mob corpses near them by gibbing them
* Portal spread chance is now exponential regression
* Portal mob spawns now linearly scale in time
* Fixes some skeleton oversights in ruin mapping
* Demon incursions no longer can spread to tiles in a space area, such as near brig plating
* Moves corpse cleanup to mobs via component
* Portals now drop bodies that are being eaten when they're destroyed.
* Addresses code review
* Docs some vars
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-07-16 00:19:23 +00:00
SchrodingersWolf
ab22665626
Makes oxygen grenades printable in Protolathe and Increase amount of oxygen grenades in Cargo Emergency Equipment Crate: Back with a vengeance ( #29595 )
...
* Oxygen nades!
* Cargo oxy nades upgrade
* I'm BACK - Edited levels, need to remake PR
* Oxygen reqs added
* Minor spelling mistake
* Update code/modules/research/designs/misc_designs.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-07-15 20:07:53 +00:00
Osetrokarasek
6d639e092a
Item States For Power Cells And Stock Parts ( #29557 )
...
* bleh
* blah
* meh
* nah
* bluh
* mwah
* added sprites for potato and slime cells too!
* added sprites for abductor cells
* ssdfg
* why the merge conflict bro 😭
2025-07-12 12:24:07 +00:00
Charlie Nolan
2e6b1fe6dc
Add timeouts to several move_away calls ( #29714 )
...
* Timeouts are important.
* Update code/game/objects/items/weapons/grenades/clusterbuster.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/grenades/clusterbuster.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/surgery/organs/organ_internal.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-07-05 05:46:10 +00:00
PopeDaveThe3th
f0c83f9803
Adds Stinger Grenades ( #29178 )
...
* ballin
* sprite change
* curse of balance
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Luc <89928798+lewcc@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: Luc <89928798+lewcc@users.noreply.github.com >
2025-07-04 19:13:08 +00:00
Toastical
9309ca46fb
Adds storage dumping ( #29641 )
...
* added storage dumping
* retain in storage item shuffling
2025-07-04 19:07:07 +00:00
kyunkyunkyun
b32a310f6c
Update cyborg_gripper.dm ( #29703 )
2025-07-01 15:02:03 +00:00
Arthri
ab5a7fdcbe
Fix technology levels of some items ( #29596 )
...
* Synchronize TECH defines with /datum/tech IDs
* Fix origin_tech values
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
2025-06-30 10:37:55 +00:00
Osetrokarasek
03b86c2625
G ( #29546 )
2025-06-25 13:20:40 +00:00
CRUNCH
40d6223486
Update scanners.dm ( #29534 )
2025-06-24 22:10:00 +00:00
CRUNCH
71c98c3adf
Weeeeeeed bro ( #29485 )
2025-06-19 17:43:35 +00:00
Osetrokarasek
200512cefb
Makes Gym Equipment Buildable And Disassemblable ( #29449 )
...
* ga
* k
* Update sheet_types.dm
* nailed it lol
* Update sheet_types.dm
2025-06-19 17:41:26 +00:00
Toastical
42ebe301d7
migrated autopsy scanner + added print cooldown ( #29565 )
2025-06-18 20:57:01 +00:00
YoureNotTheSharpest
28939d655c
Greys yearn for this PR, Replaces borg extinguishers with a Firefighting Foam variant. ( #29327 )
...
* adds a cyborg FE that starts with FFF, and replaces the old extinuishers, except for the syndicate ones.
* allows syndicate medical borg to refill their extinguisher, whoops
* Update code/game/objects/items/weapons/extinguisher.dm
grammar
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: YoureNotTheSharpest <107788621+YoureNotTheSharpest@users.noreply.github.com >
* adds spaces to comments as requested
---------
Signed-off-by: YoureNotTheSharpest <107788621+YoureNotTheSharpest@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-06-17 16:54:31 +00:00
Osetrokarasek
6c2915e581
New Mining Wardrobe ( #29515 )
...
* shoes resprites n fixes
* added under clothing sprites
* added softcaps and berets sprites
* added vendor sprite
* added missed shoes sprites lol
* coded it plus added dogfashion for baseball hat
* tweaked contents of the mining wardrobe closet
* added new vendor on all maps
* added new vendor to lavaland outpost too!
* added missing beret sprites for drasks
* added missing harshskirt sprites
* added missed pads for racial exploring suits
* Update code/modules/clothing/under/jobs/cargo.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
* Update wardrobe_vendors.dm
* recoloring
* updated desc
* Update code/datums/dog_fashion.dm
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
---------
Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-06-17 16:47:55 +00:00
Kyani
586e2e6c4d
Job Perks - True Professionals ( #29478 )
...
* ddsadsa
ddsadsa
* moderate again
* revert
* medical first steps
* more work
* lots more work done
* more progress
* finished up
* attack chain linter
* attack chain update
* attack chain work
* fixes + chemist update
* gives comments
2025-06-13 19:40:29 +00:00
warriorstar-orion
0adc3913d1
prohibit prefabs in spawner loot lists ( #29556 )
...
* prohibit prefabs in spawner loot lists
* fix copy paste
2025-06-11 17:12:47 +00:00
Kyani
fdcf4899a2
Frankenstein Station 13: Introducing dissections and alien organs to xenobiology ( #29093 )
...
* ddsadsa
ddsadsa
* moderate again
* revert
* beginning with rebase
* organssssssssss
* organs now process!
* analyzer finished! + mapping
* tool bit implementation and quality
* organs and fixes and reworks
* more organ work
* more organs done
* more organ progress!
* more organ work
* MORE. ORGANS.
* temp
* more organsssss
* ITS DONE!!!!!!!!
* oops
* also oops
* linter stuff
* forgot this + oops
* linter
* i forgot to save!
* lots of improvements and tweaks
* move icon over
* icon tweaks
* icon mistake
* oops
* dumb
* more icon validations
* i think thisll fix it?
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* fixes
* fixes+tweaks
* fix
* oops
* linter
* i didnt save....
* this should give -some- warning
* forgot a span
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* beginning edits
* more fixed and tweaks with cooldowns
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* lots of tweaks
* more review changes
* comment change
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* returns start back to gland
* Apply suggestions from code review
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* code review fixes
* trying to make surgery work....
* might as well push this
* perfection. now i need text
* text + small tweaks and bugfixing
* linting
* forgot to implement this
* deconflicting maps
* modifying for xenos again
* i guess this wasnt needed???
* added surgical belts to xeno
* minor swap
* quick fix
* small tweaks
* small tweak
* tiny tweak
* some slime updates
* more tweaks
* more updates
* first batch of fixes
* hiero audio fix
* robotic fauna fixes
* more rounds of bugfixes
* prevents teleporting
* tiny fix
* makes sharp more common
* misc fixes
* surgery and revenant fixes + extractor
* adds cursed organ logging
* small bananium organ tweak
* actually gives teleporter access
* adds a message to the analyzer
* can now drag naughts
* slime behavior tweaks
* headslug tweak, cant eat organs
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/slime/slime_mob.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/revenant/revenant.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/datums/components/special_tastes.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/gland.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/abduction/gland.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* moved this
* major rework prep
* didnt save
* rework done
* small fix
* makes aliens draggable by crew after death
* shouldnt have cut this
* xeno organ tweak + tips
* oops
* fixes and tweaks to slimes
* not used
* temp revert
* rebase map files to master
* re-applying changes
* access fix
* access tweak
* big fix for new refactor
* more refactoring
* forgot a span
* Update code/datums/components/surgery_initiator.dm
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* hiero only doesnt target dead megafauna
* various fixes
* fix requests
* fixed weird conflict markers
* deconflict
* deconflicting
* antimagic flags
* merge fixing
* Update code/modules/mining/lavaland/loot/hierophant_loot.dm
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
* regen mesh fix
* small fixes
* tick fix
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* grammar
* Update code/modules/surgery/organs/organ_internal.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/surgery/organs/organ_internal.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* Update code/modules/research/xenobiology/xenobiology_organs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
* tweaks
---------
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com >
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-06-10 16:46:56 +00:00
Osetrokarasek
8dcfbb327e
No Brute From Throwing Cig Butts ( #29445 )
...
* fo
* fa
* Update lighters.dm
2025-06-07 13:26:48 +00:00
Contrabang
f9e95a2b1d
Adds an icon for non-abstract nodrop items ( #29452 )
2025-06-07 13:25:01 +00:00
Osetrokarasek
3b25e662a2
Update cash.dm ( #29523 )
2025-06-07 13:17:06 +00:00
CRUNCH
df362db8af
Gives Medical Cyborgs a Holo Stretcher Upgrade ( #29352 )
...
* creation
* Update code/game/objects/items/robot/robot_upgrades.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-06-04 13:15:57 +00:00
kyunkyunkyun
f07620aeb3
Get rid of generic office chair type ( #29156 )
...
* remove generic chairtype from maps
* rename
* refactor
* Update sheet_types.dm
2025-06-03 18:16:14 +00:00
PopeDaveThe3th
5837434099
Adds Federation marine combat armor ( #29285 )
...
* finally
* grey
2025-05-30 21:13:03 +00:00
Stone
ccde8980d4
modified: code/game/objects/items/weapons/melee/melee_misc.dm ( #29365 )
2025-05-27 20:53:18 +00:00
Osetrokarasek
07230191d7
Update bags.dm ( #29248 )
2025-05-22 18:59:56 +00:00
Qwertytoforty
9329d265ab
Adds 2 new ruins, a space and lavaland relay ( #29335 )
...
* Adds a space and lavaland ruin
* random shelves
* oops
* and this one
* desc update
2025-05-22 14:08:42 +00:00
chuga-git
d91c93ece6
fixes runtime when building stack recipes ( #29392 )
2025-05-21 23:17:21 +00:00