a909395bfc
Adds suture and mesh packs ( #32154 )
...
* Adds suture and mesh packs
* Fixes, unmedicated needles and mesh
2026-07-07 23:48:47 +00:00
b0a8b84dbf
Add cardboard recycling. ( #31937 )
...
* Add cardboard recycling.
* Add more cardboard items to the recycling list.
2026-05-02 00:47:14 +00:00
849e33e147
Adds dueling pistols ( #31772 )
...
* Adds dueling pistols
* Bonus damage for dueling
* Oops
* Sprite stuff
* Sprites and fixes
2026-04-09 20:45:31 +00:00
481f035722
Metastation kitchen area redesign and related features, take 2 ( #30754 )
...
* Metastation kitchen area redesign and related features, take 2
* reviews
2025-12-18 23:46:17 +00:00
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
d4a435f740
You can now color boxes using crayons ( #30977 )
...
* Americanized spelling
* more spelling
* spelling + alt click
* recoloring box, put it in hand and in bag
* in backpack now
* remove old comments
* updates inventory if backpack is open
* place in bags even on floor
* null check + checks actual type
* added the color tables
* added empty subtypes. Fixed movign away bug
* lint
* mapload + as mob removal
* early returning
* removed type checks. Added more checks for coloring
* added a description + early return on color tables
* lint
* documentation, formatting, HAS_TRAIT
* formatting
2025-11-28 03:51:46 +00:00
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
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
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
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
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
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
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
5837434099
Adds Federation marine combat armor ( #29285 )
...
* finally
* grey
2025-05-30 21:13:03 +00:00
9cabc380b4
Makes Golems Mine Again ( #29154 )
2025-05-13 06:13:25 +00:00
6f0f2b8024
Syndicate mobs rework ( #28706 )
...
* initial
* i'll get fired
* update icons for mapping as well
* update maps
* tweak
* tweak and revert a bit
* tabs
* speak english, motherfucker
* oh
* updatepaths
2025-04-26 17:58:24 +00:00
bf28bfd604
Updates Rocky Motel ( #28786 )
...
* this motel rocks
* nvm i got chat gpt
* relocate icon
* oh it removed web commit
2025-04-09 19:26:42 +00:00
f9ade844c9
Kitchen rework part 1: machines and recipes. ( #28277 )
...
* Kitchen rework part 1: machines and recipes.
* update oldstation
* update updatepaths script number
* fix blank icon test
* remove old deep fryer completely
* fix duped recipes and recipe datum names
* add chef PDA cart to chefdrobe
* nerf grill wood consumption rate
* multiply food for cooking machine rating
* fix runtime
* add cookware to syndie base and oldstation
* remove dupe burger recipe, update syndie/oldstation setups
* nerf potency quality award
* buff burn/ignite times, remove pointless on_fire flag
* more grill woodburn nerf
* meh
* try and unfuck timing issues
* more fixes and icon updates
* more fixes
* more review changes
* fix linter
* disable pcwj debug
* fix grill and deep fryer overlays
* fix timers with no containers
* attempt to fix reagent adding issues
* more cleanups
* allow rped usage
* grammar, null checks, reagent display
* PDA updates, map updates
* fix mats values
* new panel sprites
* recipe fixes, add prep bowl
* revert unused icon file changes
* move this to mesh with smith TM
* remove food quality for now
* New sprites, autochef.
* fix examine text
* reduce oven cook times
* lots of fixes
* fix autochef recipes that start with reagents
* prevent shenanigans
* megapatch 1
* block ingredients behind oven door
* PDA app improvements
* remove unused proc
* fixes for cookbook, descontructions, completed steps
* allow empty containers with a tracker to be claimed
* allow reclaiming
* autochef reliability fixes
* autochef reliability fixes
* fix quality product count
* update updatepaths script
* better stack handling
* more fixes for stacks and reagents
* timers no longer turn off burners automatically
* autochef turn offs and make sure we can see output storage
* add microwave recipe for roundremoving player brains
* 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 1
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
* fix berry muffin name while i'm here
* grill -> microwave in new tests
* grill -> microwave in new tests, but actually for realsies
* i definitely know what i'm doing
* redundant attack chain setting
* add examine text about clearing buffer
* remove unused vars and start improving docs
---------
Signed-off-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-03-23 04:59:08 +00:00
30a3d825cf
Adds shell boxes for the rest of the (practical) shotgun types ( #28498 )
...
* Adds shell boxes for the rest of the (practical) shotgun types
* she frags on my 12 until I
2025-03-08 18:33:47 +00:00
a6d347e14a
Custom, crew-buildable vendors ( #28009 )
...
* Buildable vendors.
* Lint.
* I think this is right?
* It's already IN their hands.
* Lint, re-check item after prompting for price.
* Fixes.
* Review fixes, working dissassembly again.
* Apply suggestions from code review
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
* Restrict appearance to buildable vendor sprites.
* tyop fix
---------
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
2025-01-28 22:00:14 +00:00
1c1eb2d3f7
Bluespace Harvester: Loot changes, Events, and more ( #27438 )
...
* Description, vars
* Lootpools and item spawning
* Automatic spawning, Motherlode
* PBJ Bag, Proper dirty probability
* Added more items to organic lootpool
* BSH Events
* Event condensing, product var fix
* Spawn location condensing
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Postclean
* Event list relocation, some announcement changes.
* Motherlode announcement over radio instead of announcement
* Created parent type for engineering events
* Motherlode spawn location optimization and turf selection
* More efficient rarity picking
* Adjusted lootpool
* Adjusted ruins that use BSH loot pools
* Excess Spacing
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Comment Format
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Comment Format
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
* Lootpool comments
* Made syndie donk rare
* Migrated lootpools
* Map fixes
* fix up maps
* Repaths a couple map things
* Engineering event documentation and cleanup
* Product documentation, tap location, formatting
* Nulled var on destroy, documentation
* Handles not finding a valid spawn location
* Error fixes
* Fixes runtime if no NAD spawn points.
---------
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
2025-01-05 11:29:05 +00:00
d663dfc3fb
[READY FOR TM] R&D Rework Part 2 - Death to the experimentor ( #27472 )
...
* PT1 - Death to experimentor
* I cant fail CI this fast come on
* PT2 - DA -> SA
* CRLF to LF
* Strange icons in the SA now
* Lets give this a go
* AGH
* Dirt
* WORK
* Oops - cere was missing the RD locker
* Map fixes
* Adds delivery chute back
* Warrior review
* Also removes magnetics
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-12-04 17:55:39 +00:00
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
0ffa8303a7
Rename all non-snake_case types. ( #27268 )
...
* refactor: Rename all non-snake_case types (not procs or vars (yet)).
* completely dynamic update script
* might help to include the data
* update aa's scuffed python
* oh
* set script PR number
* run updatepaths again
* Add other table updates with JSON columns
* bump SQL version
* just fucking end my life
* move JSON data
2024-11-30 19:08:45 +00:00
cd2cdd33f4
Plasmamen drip - Tacticool Suit ( #27092 )
...
* Plasmaman Tactical Suits
Drip needed
* Clarification for dummies
* Radial Menu
* Removed the unneeded helmets.
* Desc Fix.
* Documentation and Static
* Unnecessary Check
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Documentation Fix
* Alt-Click better
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Better
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Initial for diver
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Contrabang requested changes.
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Requested Changes
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
* Update code/modules/clothing/spacesuits/plasmamen.dm
Requested Changes - Hands Blocked trait
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
---------
Signed-off-by: Ordosian <109176750+Ordosian@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-11-11 13:04:17 +00:00
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
766816954d
Fixes some shell box issues ( #27166 )
...
* Fixes some shell box issues
* Contra review
* Renaming
2024-10-23 17:44:21 +00:00
f5a4bd0e4b
Resprites shotgun shell boxes (with fancy storage!) ( #27006 )
...
* Idk what I'm gonna do with this
* This needs a lot of cleaning up
* Absolute hell
* Fixes and reverts
* Shhhhh
* SHHHHHHH
* Accepting my least atomic PR of the year award
* Fix rubbershot name
* Update code/game/objects/effects/spawners/lootdrop.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Contra review
* Contra review
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-10-22 10:41:35 +00:00
7d7f1bb10e
Update boxes.dm ( #26969 )
2024-10-22 09:26:01 +00:00
d856d5c74b
[TWEAK/BALANCE] Destroyed monkey cube box now destroys monkey cubes inside ( #26816 )
...
* Destroyed monkey cube box now destroys monkey cubes
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Adrer <erwin@lombok.demon.nl >
---------
Signed-off-by: Adrer <erwin@lombok.demon.nl >
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-09-23 22:46:45 +00:00
03bc64ad13
R&D Rework PT1 - The network refactor ( #26420 )
...
* R&D Rework PT1
* Give robotics access too
* Run prettier
* More lints
* This is INCREDIBLY ironic
* Re-add blacklisting
* Oops
* Review changes
* Some fixes
* Fix outstanding issues
* Warriorstar fixes
* Tiny tweak
2024-09-08 16:38:17 +00:00
52db63784e
Adds 3 new light crates ( #26449 )
...
* adds 3 illumination crates
* adds more glowsticks to premium box
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@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: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-08-14 14:40:52 +00:00
098b13bb33
Removes the empty type of /snacks ( #26010 )
...
* Aaaaa it works
* Add updatepaths
* Add unsaved files
* MATTTTT
* Fixes casino
* Fix
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-29 14:46:04 +00:00
4cf6595d12
Makes all playsounds use bools for vary ( #26183 )
...
* Makes all playsounds use `TRUE` for vary
* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
ce5f820181
Adds the Research & Development Crate - For Continuing Science After the End of the World ( #25990 )
...
* Update pack_science.dm
* BOX
2024-07-01 18:55:47 +00:00
f0cef57c17
Nian Caterpillar Infestation and Worme Invasion ( #25560 )
...
* I hate DMI merge conflicts.
* Attempt at full merge conflict resolution
* Ticked >:C
* Moves the include because
* Fixes missing proc.
* 🫃
* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.
* Adds changes requested by DGamerL
* Replaces space indents with tabs. Error caused by copy pasting.
* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Uniforms the tab spacing.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Adds requested changes from @lewcc
* Removes so missed #undef in `monkey.dm`
---------
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-22 18:20:27 +00:00
173ff7e7d4
Deathsquad buff ( #25744 )
2024-06-12 19:17:18 +00:00
ac5a4dfe11
Add colors to pill bottles and patch packs ( #25650 )
...
* Add colors to pill bottles and patch packs
* Tweak chem master colors
* Make patch pack overlay lighter
* Deduplicate code and update colors
* Fix linter
* Move proc
---------
Co-authored-by: Arthri <41360489+a@users.noreply.github.com >
2024-06-06 13:08:31 +00:00
d2004bec51
gives ERT Survival medipen ( #25574 )
2024-05-31 01:22:04 +00:00
0d1eb5110d
Adds Holy Water Darts to Cargo ( #25468 )
...
* die monster you do not belong in this world
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/projectiles/ammunition/ammo_casings.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
2024-05-30 15:57:35 +00:00
5a68c5f6d3
Explorer Redux ( #24202 )
...
* WE'RE SO BACK
* LET THERE BE SOUND
* More bugs
* fixes
* sound
* hmm
* clothing sprites + minor code changes to clothes
* meestake
* spritening
* YARR
* hiss
* Cyberiad explorer remap
* hand telover
* delta days
* rooms done
* VENDOR
* Mapping done
* Salvage mapped
* qol
* Forgot the hivelord.
* woops
* oops redux
* reviews and more
* consistency
* Update code/game/jobs/job_globals.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* character
* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mob/living/simple_animal/hostile/pirate.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/effects/spawners/random_spawners.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/research/designs/machine_designs.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* some reviews
* Update code/game/machinery/constructable_frame.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* supply
* area repathing and ambience
* mapping
* metamapping
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* the doorening
* redooring
* modsuit
* more reviews
* the plasmamamninigngg
* add random salvage generation across space ruins
* add blackbox tracking for salvage sold
* gun
* deconflicts and reviews
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/head/job_hats.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/garment.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* all conversations resolved
* maybe work now?
* please no more, too many apcs
* Update code/modules/mob/living/simple_animal/corpse.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/sellable.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* henri review + action figure
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* PDA
* conflicts
* more conflicts
* maybe all conflcits?
* wait fuck
* maybe fixed???
* KIDAN SPRITES
* MAYBE?
* access fixes
* explorer hotfixes 1:
- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room
* add salvage selling back
* NOT FOR SALE
* oh my god actually sell the fucking salvage this time
* maybe fine now?
* carpover
* NO MORE CABLE
* balance tweaks
* some depot loot updates
* merge conflict
* deconflicted???
* woops more oversights
* skirts, bombers, exploredrobe code + sprites
* woops (again)
* deconflicting
* remove old explorer room again
* Hat fix
* minor changes to sprites and code for hats
* yarrr fix 1
* first fixes
* don't drop loot from syndies gibbed by depot destruction
* add selling back with new signal based system
* speedmerge this shit
* minor changes to collars/bomber resprite
* docking port in
* ruins
* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN
* no more murder hallway on whiteship
* undelete meson sunglasses, redelete uristrunes
* BOOTY BAGS
* don't drop ashdrake loot from crusher kills
* box: fix ntrep fax, add explorer access to ORMroom
* add meson sunglasses item icon back
* fix cere handtele, meta shutter control, death sound arg
* cleaning up
* she mosins on my russian till i dj station
* Update code/modules/clothing/head/soft_caps.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/clothing/suits/misc_suits.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/mining/machine_vending.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/game/gamemodes/game_mode.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* mapping
* Cleaning up
* revert changes in tools/{bootstrap,ci}
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com >
Co-authored-by: warriorstar-orion <orion@snowfrost.garden >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: github-actions <github-actions@github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-05-27 19:27:59 +00:00
3e9c29258e
Diverse Traders ( #24883 )
...
* Diverse Traders Types
* Trader Type control, announcements, species spawning
* Trader Outfits
* Posh Moth - Posh Cane
* Landmarks, Trader ID Name Change
* Trader Shuttle Adjustment - Landmarks for Item Pools
* Outfit Survival Kit changes
* Added another refill for the hand labeler due to more cargo
* Trader Shuttle locker fix
* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle
* Mech access, No double mechs, Small box fix
* Removed Solgov Gunkit from General Pool
* Spacing
* Moved traders to not be event subtypes, added documentation to vars
* Boxed spacing, removed improper
* Moved postequip, used box variables
* Lore team requested change - Bolt action instead of AK
* Changed landmark
* Moved soviet ammo to minor gear, increased soviet minor gear to 8.
* Obfuscated Cybersun
* Lootpool Adjustments
* Readded Solgov Kit to general pool at low weight
* Commas!
* Spelling
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Comments
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Re-Nulled After_Equip_Job
* Removed extraneous var spaces
* Relocated space in trader introduction message
* Robomoon is now once again Cybersun
* Impropered Enforcer Kit
* No more ERT box for non-NT boxes
* Fixed turbine kit stock part amount
* Subtyped skrell/unathi suit boxes
* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons
* Reduced weight on arm/esword implant rare items
* Also reduced arm laser weight
* Added a couple items to skipjack large - more 'random', filled in reduced weights
* Path typo fix
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Removed trailing / in path
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Removed Cheap Breacher suit from inventory
* Apply suggestions from code review
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-04-30 00:51:19 +00:00
9e6dcf9c46
removes the remaining datum redeclares ( #25220 )
...
* removes the remaining datum redeclares
* the two fixes
* finneee contra
* OK CONTRA
* readd
* CURSED TO BE BROWN!
* facking automerge
2024-04-21 18:26:35 +00:00
bad8b31afa
Changes all .len to length() where applicable ( #25174 )
...
* Globals work
* Double access works
* All other things
* Revert "All other things"
This reverts commit 6574442eb666401072+Oyu07@users.noreply.github.com >
* Update code/__HELPERS/sanitize_values.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
---------
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com >
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
2024-04-19 17:32:09 +00:00
de1229b947
Removes various helpers that can be simplified in a single variable check ( #24551 )
...
* Removes the first weird helper
* Removes get_turf_or_move
* Slightly alters the sharp weapon proc
* Adds nullcheck to adjustBruteLossByPart
* Changes `is_dead`
* Adds `hasorgans` to the replaced list
* Update code/__HELPERS/unsorted.dm
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
* Contra review
---------
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com >
2024-03-25 01:31:56 +00:00
3557748229
People are now hidden behind smoke ( #24229 )
...
* no, that is NOT solid snake
* lol
* more names
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/belt.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2024-03-11 14:13:59 -04:00
046c841cab
New plasmaman suit - Coke Suit ( #24465 )
...
* all done????
* no
* ave emperor
* aaaand last pixel adjsutment
* Update code/modules/client/preference/loadout/loadout_racial.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* box name
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/client/preference/loadout/loadout_racial.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-03-10 18:19:55 +00:00
0667f20681
move all EOL comments on typepath names to dmdoc ( #23928 )
...
* move all EOL comments on typepath names to dmdoc
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-03-01 20:05:49 +00:00
151a3b965e
Fixes the metal foam box sprite being invisible ( #23888 )
2024-01-25 14:24:37 -05:00
192b8224b8
Anomaly core modules for modsuits ( #23154 )
...
* firewall
* shielded part 1
* WIP: Anomaly core modules for modsuits
* icons, vortex
* cryogrenade, nerfs teslawall
* message admins moment
* Update uplink_nuclear.dm
* rnd designs
* now uses the flayer icon state
* Apply suggestions from code review
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* early returns, barricade types, and comments, oh my
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* updates desc, remove comment, removes /hardsuit/
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-01-21 19:17:18 +00:00
PollardTheDragon