Qwertytoforty
746de75bdd
Adds most shotgun ammo boxes to cargo. Allows them to be crafted. ( #30837 )
...
* pope why didn't you test it haughughuugughuhguhguhgh
* ok let us be real it doesn't need 50 more what was I thinking
* oop
* a static shock
* spelling
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* so full of order of operations yum
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2025-11-08 22:11:53 +00:00
SPACEGEESE
bee4f00416
changes surgery_initiator to /robo/sharp ( #30873 )
...
/robo to /robo/sharp, should fix bug while retaining silicon effectiveness in wiki
Signed-off-by: SPACEGEESE <136994596+spacegeese@users.noreply.github.com >
2025-11-07 16:29:28 +00:00
Alan
47300bb0d0
Expand chef ensemble possibilities ( #30826 )
...
* Add many chef clothes to game, chefdrobe, and loadout.
* Add another chef envirosuit.
2025-11-05 10:22:00 +00:00
PollardTheDragon
ae4489cb2f
Converts bees to basic mobs ( #30662 )
...
* Converts bees to basic mobs
* Undefs
* Linters
2025-10-28 20:53:18 +00:00
Qwertytoforty
2ecff9033a
[PTBF] [ready for review] Anomalous particulate processing objective. ( #30649 )
...
* pausing work on this till pickweight
* push
* more stuff
* proper file it
* these 2 would be interested
* and examine fix
* I should be more awake before resolving merge conflicts
* god you are stupid stop commiting every 2 seconds
* temp buff size change
* Event inhand descriptions
* behold the c o d e
* the rest of the owl
* sprite correction
* 2 more words to the list
* and this one
* yes I am having too much fun with this
* m o r e
* better glow, tech levels
* Apply suggestions from code review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* message admins, variable
* Apply suggestions from code review
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
* PPPProcessor
---------
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com >
2025-10-25 01:01:03 +00:00
Alan
d55e4552c5
Fix the Captain's saber being invisible and undrawable in the eyes of others. ( #30749 )
2025-10-23 10:10:02 +00:00
PollardTheDragon
3e149e8e6b
Improved Ashwalker Armory: Bone Equipment ( #30600 )
...
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix
* sword inhands
* Adds Light Bone Armor
* Linters
* Species sprites
* Fixes my crap grammar
* Updates belt icon sprite
2025-10-19 19:06:58 +00:00
PollardTheDragon
fbd8930ff4
Securiblade Redux ( #30488 )
...
* Securiblade Redux
* It's back
* Vars
* LINTERS
* Apply AP on burn damage
* Fixes recharger bug
* Slapper, Better code, cleanup, no damage on help intent while off or stun, sounds
* Secblade now makes a sound when turning itself off
2025-10-17 17:00:50 +00:00
Alan
b2e0a08d0b
Add a LOT of chaplain clothes from various religions. ( #30483 )
...
* Add a LOT of chaplain clothes from various religions.
* Thanks, linter!
* Deploy vendors, box envirosuits, unaccent names
* Thanks, linters!
* Accommodate ears.
* Correct accent oversight.
* Merge branch 'master' into chaplain-outfits
Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
2025-10-13 15:16:33 +00:00
kyunkyunkyun
9b095a559d
Remove (almost) unused var/item_color from /obj/item ( #30453 )
...
* it's black and white
* Update soft_caps.dm
* bruh
* bruh
* tweaks
* comment
* Update abduction_gear.dm
* Update paradise.dme
* Update paradise.dme
* Update paradise.dme
---------
Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com >
2025-10-06 17:59:46 +00:00
PollardTheDragon
37bcc87b39
Expanded productivity bit usage ( #30476 )
2025-10-01 14:49:32 +00:00
PollardTheDragon
e14a43eea1
Basic diona nymphs, spiderbots, and crabs ( #30377 )
...
* Basic nymphs, spiderbots, and crabs
* Nutrition fix
* Forgot a line
* Cooldown on eat
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
2025-10-01 14:32:00 +00:00
kyunkyunkyun
caa8343bf7
Repath some satchels ( #30427 )
...
* fix satchel interactions
* updatepaths name
2025-09-27 08:46:36 +00:00
kyunkyunkyun
83509c3967
Some more armor tweaks ( #30398 )
...
* summary
* (required)
* undef
* oh this is unused, nice
* ok but.. why
* a tiny bit more
* Update human_defense.dm
* Update mass_hallucination.dm
2025-09-19 15:43:42 +00:00
iramoye
e3f373077e
Initial commit ( #30486 )
2025-09-18 19:30:21 +00:00
PollardTheDragon
280ab5c19f
Stops homerun bat from storing homerun charge after drop ( #30478 )
2025-09-18 06:00:34 +00:00
1080pCat
4ffa9870cd
Migrates the baseball bat to the new attack chain, and makes it use tg cooldowns ( #30387 )
...
* migrates the baseball bat to the new attack chain, and makes it use tg cooldowns
* meant to revert that
* moves a var
* Update weaponry.dm
2025-09-14 19:52:30 +00:00
warriorstar-orion
3208049a8a
Attack chain migration: structures. ( #30365 )
...
* Attack chain migration: structures.
* whoops
* wth
2025-09-14 19:21:36 +00:00
kyunkyunkyun
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
PollardTheDragon
0f438326b6
Converts Viscerators and Malfunctioning Combat Drones to Basic Mobs ( #30080 )
...
* Initial Commit
* Targetting
* Linters
* Update code/modules/mob/living/basic/retaliate/combat_drone.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* CI fix
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-09-11 02:34:37 +00:00
kyunkyunkyun
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
5b368c3f8f
Renames some pre_attack arguments ( #30324 )
...
* Renames some pre_attack arguments
* fix
2025-09-04 07:11:59 +00:00
Contrabang
7bdc36a032
Adds the syndicate equivalent of a mindshield, and other syndicate officer adjustments ( #30311 )
...
* Adds the syndicate equivalent of a mindshield
* ci yay
* Update code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/items/weapons/bio_chips/bio_chip_fluff.dm
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* suspicion
---------
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
2025-09-04 07:09:56 +00:00
warriorstar-orion
7022365e53
add CI check for exploitable recycle costs ( #30286 )
2025-09-04 07:00:12 +00:00
kyunkyunkyun
ca8e5a6a7d
nerf that water ( #30209 )
2025-09-02 05:53:52 +00:00
Contrabang
e1f42f4673
pre_attack change ( #30305 )
2025-09-01 21:10:58 +00:00
kyunkyunkyun
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
Osetrokarasek
90af6975e6
Fixing knifes material amount ( #30323 )
2025-08-29 15:19:17 +00:00
Chap
8b8181e18a
Upgrade ERT oxygen tanks to doubles. ( #30208 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2025-08-28 20:54:42 +00:00
Chap
3507562a81
[FIX] People lying on the ground can no longer be snared by a bola ( #30180 )
...
* People lying on the ground can no longer be hit by a bola.
* Use the IS_HORIZONTAL macro instead
---------
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2025-08-28 16:12:32 +00:00
Osetrokarasek
97047c3bb9
Emptying Lathed Welding Tools And Extinguishers ( #30137 )
...
* asfgdsa
* cnrbangn rqerqest chaengs...
2025-08-26 01:49:10 +00:00
Silverplate
bf750135d0
CSI Eridani: Detective content update ( #27512 )
...
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* forensic supply crate
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* forensic supply crate
* Mapping changes
* Mapping changes
* Ports Bay/ss220 detective work
* Removs detective scanner from circulation
* makes linters work
* i hate vscode
* fixes some nonsence
* may fix CI
* restore maps to CURRENT
* QOL
* makes gunshot residue actually work.
* fixes cursed logic
* adds scene cards again
* scene cards but real!
* fix med records, breaks attack chain
* Revives the PR
* fixes swabs
* TGUI update
* lewc and dgl first reviews
* dna medical records
* LINTERS FIX
* linter fix 2
* blood fix and linters again
* oops
* updated but broke
* help
* Chuga suggestion
* Fix shoes ending up with a null blood_DNA entry
* replace astype() because linters are still in the stone age
* 2 fixes, adds fingerprint cards to HOP locker.
* check user intent instead of target intent when swabbing
* adds 2 boxes of swabs to the det drobe
* comma important
* adds new det tools to sec belt
* Chuga review
* fuckin github
* should fix TM
* oops
* how about now
* also fixes cere
* fixes mobvars
* Update code/modules/detective_work/swabs.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Update code/game/objects/effects/decals/cleanable.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Lewc review easy changes
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* Updated related bugfixes
* add swab to lathe
* fix metastation
* Fixes scene_cards
* fix cerestation
* fixes forensic kits
* Changes and fixes forensic_machines
* changes /obj/item/sample to use initialize
* spaces
* fix initialize to use a capital I
* mapload
* fixes linters probably
* meta fix
* swab fix maybe
* oops
* actual fix probably
* ma ybe
* bundle rebuild
* fixes fingerprint cards
* remove duplicate proc call
* /obj/item/sample migration
* /obj/item/forensics migration
* microscope and dnaforensics machines migrated
* I FORGOT DA VARS
* linter fix
* linter fix 2
* Funny review part 1
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* bundle update
* contra/funny review
* fixes CI probably
* CI fix
* cere mapping fix yipee
* screwdriver panel fixes
* improve forensic machine interactions
* improve open panel msg
* pollard review
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* linter fix
* Apply suggestions from pope review
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
* rebuild
* rebuild
* Detective Rework
---------
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com >
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
2025-08-23 15:27:38 +00:00
Contrabang
b2e6789f5a
Migrates bedsheets, bedsheet bins, beachballs, baseballs, basketballs, and banhammers to the new attack chain ( #30170 )
...
* bedsheet
* click tweak
2025-08-22 14:30:29 +00:00
kyunkyunkyun
1f461fe2d2
Nullify all armor that is equal to armor = null ( #30116 )
...
* nullifier
* manually remove identical vars
2025-08-19 13:13:41 +00:00
Alan
24c47a3d79
Rework spray bottles and tools based on them somewhat. ( #29977 )
...
* Rework spray bottles and tools based on them somewhat.
Consolidate spray adjustment functions.
Change method of preventing spray amount adjustment.
Standardize most spray amounts at 10u/2 tiles and 5u/1 tile.
Should fix the following issues:
https://github.com/ParadiseSS13/Paradise/issues/29930
https://github.com/ParadiseSS13/Paradise/issues/28964
* Adjust spray rework based on review comments
Change `adjustable` var to boolean
Change `adjust_verb` to `adjust_action`
Tie spray transfer amount to tile reach
2025-08-19 00:26:53 +00:00
iramoye
94f137c41c
Renames Zvezhan to Cygni Standard ( #29965 )
...
* looks good to me
* replaces mentions of humans
* Revert "looks good to me", as Trinary is not being replaced
This reverts commit 275aca6adb
2025-08-15 06:41:27 +00:00
Alan
fb42a234f2
Resprite chef outfit for relevant species, icons ( #29959 )
...
* Resprite chef outfit for relevant species, icons
Change underclothing for human, drask, grey, kidan, vox, human, inventory, inhand.
Change uniform and helmet for plasmaman, including inventory icon.
Change hat for human, drask, grey, kidan, vox, corgi, inventory, and inhand.
Change belt (apron) for human, inventory, and inhand. Add new belt files for kidan and vox.
Change chef code to support new items for species and hands that didn't have them before.
* Remove identical belt file path, caught by linter
2025-08-12 06:10:58 +00:00
Toastical
15cdc436d5
fix extinguishers not going into backpack when safety is off ( #30055 )
...
* fix extinguishers not going into backpack when safety is off
* Update code/game/objects/items/weapons/extinguisher.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com >
---------
Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2025-08-12 03:23:07 +00:00
Contrabang
5f7b650401
Fixes for #29996 ( #30005 )
2025-08-10 14:34:04 +00:00
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
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 06e0f77564100510026+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
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
