Commit Graph

11991 Commits

Author SHA1 Message Date
Spaghetti-bit a7d1610255 [HOTFIX] Nianworme inhand / UI sprite fix (#26009)
* Should fix the missing hand sprite for caterpillars.

* Adjusts a comment.
2024-06-22 22:43:09 +00:00
Spaghetti-bit 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
Contrabang 18b0b09778 adds spawners for NPC zombies (#25873)
* lmao

* lol

* yes

* yeah sure

* fix

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* lewc review + duplicate

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-06-20 11:38:23 +00:00
Qwertytoforty 489f4ae85c no patrick you have to put effort in (#25973) 2024-06-19 15:49:26 +00:00
SynthTee fa578375db REOPEN. Adds nanotrasen pin, pride pins and pride undershirts. (#25833)
* be whoo you areee for your prideeeee. don't hideee

* nanotrasen pride nationwide

* Update code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-18 00:14:24 +00:00
chuga-git d12eaadcc4 Actually fixes account_name runtime in rename_character (#25880)
* this is why you test things

* Update code/modules/mob/mob_misc_procs.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

---------

Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2024-06-16 12:18:52 +00:00
Qwertytoforty 9ddfe201af blood drunk is no longer comically afraid of lava (#25910) 2024-06-16 12:13:21 +00:00
Contrabang a7c273463d More Zombie Tweaks (#25789)
* lmao

* text fix

* lol
2024-06-12 22:02:53 +00:00
Qwertytoforty bee5321b88 Humans now instantly fall asleep at -100 HP, rather than after am (up to) 2 second delay (#25723) 2024-06-12 21:39:35 +00:00
chuga-git 4ab93fb50e Fixes eye_color runtimes for Drask, Kidan, and Nian (#25856)
* null check for eyes

* return ternary
2024-06-12 19:19:04 +00:00
warriorstar-orion a58d766f72 cleanup hardsuit-related code (#25746)
* cleanup hardsuit-related code

* kill sprite too
2024-06-12 18:05:15 +00:00
larentoun 2fb2084108 Converts Nutrition alert to hud element (#25616)
* hud

* convert nutrition from alert to hud

* return alert5 and remove some unused ui defines

* reorganize top-to-bottom
2024-06-12 18:03:16 +00:00
Blaze2377 f691860926 adds modular painter to maintenance drones (#25606) 2024-06-12 18:01:42 +00:00
CRUNCH 77d83ef1b9 Refactors Borg Grippers a Bit More, Adds Mining Gripper. Borgs Drop Items in Storage Modules if Gibbed. (#25511)
* Another gripper refactor

* Update code/modules/mob/living/silicon/robot/robot_modules.dm

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* refactor extended description

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
2024-06-12 17:58:10 +00:00
Luc 4da3d4f40b Allows for brainmobs (particularly, robo-brains) to ghost (#25774)
* gives brains free ghosting, if they so desire

* if you're in a bag or something, probably better

* add prompting
2024-06-11 06:57:48 +00:00
PopeDaveThe3th 5f3aabdf55 Rewrites the Slime People intro blurb (#25792)
* slime lore

* grammar

* a

* Update slimepeople.dm

Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@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: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
2024-06-11 06:56:41 +00:00
Charlie Nolan cb7d6f1c1b I don't see the problem. (#25783)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-06-09 11:42:24 +00:00
Charlie Nolan d3584b1d1c LINDA -> MILLA (#25328)
* LINDA -> MILLA

* Tiles now change their atmos mode properly.

* Fixed a bug that made walls generate supercold air when deconstructed/destroyed.

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Begone, var!

* MILLA -> milla

* Lint.

* More lint.

* Prevent negative/NaN atmos from spreading.

* Made fires start more reliably.

* Undef what the rest should not see.

* Enums are nice.

* Match LINDA better.

* Debugging verbs.

* Debug verb fixes.

* Labelled more lavaland stuff with ATMOS_MODE_LAVALAND

* Block superconductivity on a couple more things for Lavaland.

* Updated milla.dll

* Lavaland map fixes.

* Missed a spot.

* Begone, var! (again)

* Add libmilla_ci.so for continuous integration tests.

* Install/contributing instructions for MILLA.

* Directional plasmaglass windows on shuttles shouldn't stop protecting from heat after moving.

* Banish bad naming.

* Better naming and debug stats for SSair.

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Magic numbers and formatting.

* Don't screw up the temperature during reactions.

* Efficiency and readability.

* Fix hotspots.

* Removed redundant safety (MILLA will already output an error)

* Optimizations.

* oops

* TGS build script update.

* Change API of gas_mixture and how you get one from a turf.

* Get in there.

* so many vars

* MILLA binary updates.

* Lint

* Made MT cost more honest.

* Gave MILLA a read-only mode.

* More read-only vs synchronized mode work.

* Even more.

* Synchronize disposals.

* Updated a bunch of stuff to use SSair.synchronize or GM.synchronize.

* MILLA <3 Tracy

* lint

* cargo fmt

* more lint

* Test needed MILLA sync.

* Silence atmos machinery that's behaving as intended, but continue objecting to other potential failures to synchronize.

* Push new MILLA DLL

* Build MILLA

* Update PR instructions for MILLA.

* Add some fancy plasmaglass windows to the Lifebringers' ship.

* The golems remembered that they should insulate *all* their engines.

* First round of TM bugfixes.

* Build MILLA

* fix two lavaland ruin turf types

* bunch more maps

* fixes milla ci and makes the interesting turf verb better

* Solid turfs can no longer conduct heat (for now...)

* Made indoor tiles in beach and winter biodomes not lavaland air.

* Re-added random IT teleport, adjusted warning message

* Fixed a tinted window on Lavaland to be a plasglass window instead.

* Made firelocks and holofans heatproof

* Made RPD auto-wrench pipes if you have a wrench in your offhand.

* Runtime fixes.

* Made visuals update more reliably.

* Lint

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* The Syndicate have installed tiny fans on their research base.

* The syndicate have figured out how to make plastitanium windows heatproof.

* This is getting out of hand. Now there are two of them.

* Un-break the auto-wrenching that I broke before committing.

* Build MILLA

* Build MILLA

* Massive MILLA refactor, assorted bugfixes.

* Build MILLA

* Explicit typing.

* Less sleeping/blocking.

* Build MILLA

* Yes, yes, this part can sleep.

* Build MILLA

* SSair reporting improvements.

* Build MILLA

* Please do not dock twice and splat yourself.

* Build MILLA

* Pls to not make SM go nuts.

* Build MILLA

* Build MILLA

* Added stricter lower bounds on plasmafire, fixing perpetually-burning SM.

* Build MILLA

* Lint

* Temporary logging, begone.

* Build MILLA

* Prevent hotspot strobing.

* Add in radiate_to_spess behavior.

* Build MILLA

* progress

* Compiling is good.

* bugfixes

* Progress.

* Ruins update.

* This one exists.

* Fixup temporary hotspots to last longer than one tick.

* Add/fix comments.

* Cut the slash.

* Fix test.

* No sleep for you.

* Build MILLA

* Prevent nested MILLA safety from runtiming.

* Build MILLA

* Runtime fix.

* Build MILLA

* Fix canisters not updating icon when gas contents change.

* Build MILLA

* Build MILLA

* Fixed an issue that made mechs very cold on environment air.

* Build MILLA

* oops

* Build MILLA

* Walls can make loud noises again.

* Build MILLA

* Fixes a rare runtime.

* Build MILLA

* Update .github/DOWNLOADING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Review suggestions

* Lint

* Build MILLA

* bound_mixtures now only contains mixtures that can be written

* Build MILLA

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Build MILLA

* Restore the original async behavior of pyro anomalies.

* Build MILLA

* Build MILLA

* Make the safety assertion in /datum/milla_safe safer.

* Build MILLA

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: GDN <Roanrichards1@Gmail.com>
2024-06-09 07:18:11 +00:00
chuga-git b0f10e0e6b go away account name runtime (#25845) 2024-06-07 18:51:06 +00:00
Contrabang ab5b0c38c6 Adds an SSD Category to the Orbit Menu (#25563)
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-06-06 21:05:27 +00:00
DGamerL 3c05597cfa Changes animate_movement to defines (#25670)
* Changes animate_movement to defines

* Oops
2024-06-06 20:30:10 +00:00
HMBGERDO 9199edae9d bots will not longer be beaten (#25683) 2024-06-06 20:28:22 +00:00
HMBGERDO 7317782a48 brain can understand itself yay (#25680) 2024-06-06 20:28:03 +00:00
DGamerL 3db0b5d98d Changes over all instances of new/list() to something more sensible (#25569)
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-06 20:23:33 +00:00
Spaghetti-bit 25d0e71004 Legalize Nian Diversity Hires (#25535)
* Changes necrosis_prob to use decaylevel.

* Reverts previous change to create a new branch.

* Nian customization updates.

* Introduces 3 new colors for nians. Allows them to have hair.

* FIxes an empty block CI / lint error

* So.... I forgot to fix a comment, nians are not vox.

* update to `r_moth_dark.dmi` + nian antennae coloring fix.

* fixes r_moth_dark

* Asesprite didn't save the updates to the sprite, had to redo them.

* Reverts previous change to create a new branch.

* Nian customization updates.

* Introduces 3 new colors for nians. Allows them to have hair.

* FIxes an empty block CI / lint error

* So.... I forgot to fix a comment, nians are not vox.

* update to `r_moth_dark.dmi` + nian antennae coloring fix.

* fixes r_moth_dark

* Asesprite didn't save the updates to the sprite, had to redo them.

* Slightly modernizes the nian sprite

* Accidentally reverted formaldehyde

* Modifies nian eyes to look more alien.

* Updates nian eyes to be lorger (1px), updates the colors of nians.

* Update medicine.dm

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

* Fixes the W and E facing arm sprites

* Final commit until reviews dictate otherwise: Fixed stray pixels on purple nian.

* Changes with @McRamon  to make the sprites pop a little more. :)

* Fixes unnecessarily swol moths...

* Fixes the West facing torso for the beige moff

* Last minute fix to r_moth_dark ... torso sprites W/E were inverted.

* Update code/modules/mob/living/carbon/human/species/moth.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-06-06 20:23:21 +00:00
HMBGERDO 7a4c4878b5 Fixing increased stamina crit regen time (#25734)
* stamina regen should be 10(+2) seconds, not 20(+2)

* less lines of code
2024-06-06 19:10:34 +00:00
HMBGERDO 40001df104 You no longer hit IPC on help intent if they are missing a limb (#25703)
* dont hit IPC

* cable coils too
2024-06-06 18:56:54 +00:00
DGamerL 37ffe943e4 Removes duplicate definitions in types (#25702)
* Removes duplicate definitions

* One more
2024-06-06 18:56:03 +00:00
Rayforx 3ca2c729a9 Lavaland elites rules are now shown on victory (#25398)
* Update elite.dm

* Update elite.dm

* I am stupid'tm

* Makes it a list instead

* Update code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
2024-06-06 05:37:26 +00:00
Qwertytoforty 3b9f0bc048 the code stepped out of line (#25786) 2024-06-05 20:24:04 +00:00
Qwertytoforty 7a7f2bde8f Hardmode constructs no longer die to lavalands heat or ash storms (#25753) 2024-06-03 01:02:11 +00:00
GDN d75154fc7a Jaunt abilities are no longer blocked by blessed tiles (#25138)
* Jaunt abilties are no longer blocked by blessed tiles

* Wraiths are blocked by blessed tiles again

---------

Co-authored-by: DGamerL <daan.lyklema@gmail.com>
2024-06-01 21:39:53 +00:00
BiancaWilkson c876b64faa Fixing the mach speed closet (#25737) 2024-06-01 01:26:35 +00:00
HMBGERDO 480900bb19 Lowering megafauna mouse_opacity (#25573)
* Megafauna is already big enough

* no longer relevant

* space
2024-05-31 15:36:12 +00:00
Contrabang bc0c8344cf Adds Zombies (Admin-spawn) (#25381)
* fuck it good enough

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* TRIPLE-REVIEW

* this should do it

* wow

* bruh

* FIX

* fix

* yeah

* sirryan review

* aaaaa

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-31 02:17:31 +00:00
chuga-git 3c94c686f4 prevents funny things from happening (#25705) 2024-05-30 22:08:24 +00:00
Matt ee6969bcac Animalize tgui (#25455) 2024-05-30 16:02:49 +00:00
DGamerL 8440ba64f1 Adds RSG immune back to MODsuits that lost it (#25669)
* Adds RSG immune to Dsquad MODsuits

* Updates string

* Adds trait to Gamma MODsuits for Sec and Medical
2024-05-30 15:26:19 +00:00
Spaghetti-bit f1838b83e9 [FIX] My webbings, where are they? (#25570)
* Changes necrosis_prob to use decaylevel.

* Reverts previous change to create a new branch.

* Reverts (https://github.com/ParadiseSS13/Paradise/pull/24667)

* Does not revert the previous PR, it builds upon it. Allowing items on the belt slot with the "special" var set to TRUE to overlay suits.

Judo Belt, Webbings, and Bandolier are the current selection.

* Fully fleshes out the layering of special belts.

* Adds more belts to the special layer.

* Fixes an oversight with the captain's rapier being left out. 😭

* Fixes a few more oversights caused by a pull/fetch.

* Moves around an if statement to fix the order of operations, which was causing items that should've been OVER the suit item to be appear UNDER it.

* Should resolve the merge conflict.

* Partial revert

* Merge conflict resolution

* Refactors how a 'special belt' is defined and handled. Makes it more readable.

* renames all instances of `special` to `layer_over_suit`
2024-05-30 12:14:34 +00:00
Contrabang 8dc8c8b47f wow (#25691) 2024-05-29 22:09:37 +00:00
Qwertytoforty 97d43770f5 Adds advanced_bullet_dodge_chance, for admin / mob use. Applies it to space combat drones (#25336)
* Adds advanced_bullet_dodge_chance, for admin / mob use

* actually just make it 25

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-05-29 13:37:36 +00:00
Contrabang 40d03dd669 Fixes beepsky (#25675)
* yowza

* whabam
2024-05-29 02:08:03 +00:00
Contrabang d43beeccd4 Fixes stretchers getting caught on wall corners (#25592)
* Fixes stretchers getting caught on wall corners

* Update code/modules/mob/living/living.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-05-28 13:16:09 +00:00
Marm 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
Qwertytoforty d107f06ee3 [s] maint drones no longer can endlessly ghost and respawn (#25651)
* [s] maint drones no longer can endlessly ghost and respawn

* comment improvement

* she trues on my false till I 0
2024-05-27 15:25:27 +00:00
Daylight 8412356b22 Punctuation (#25627) 2024-05-25 18:39:43 +00:00
CRUNCH bd0e54752e Removes the Sheet Snatcher 9000 (#25496)
* Yeetus Deletus

* removed icon

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-25 15:48:22 +00:00
Deniz d30d122ebe tested (#25387) 2024-05-24 18:26:49 +00:00
Charlie Nolan 82a1cc6a4e Revert #25303 and subsequent fixes (#25613)
* Revert "Be safe, radios. (#25595)"

This reverts commit bfa88abd5a.

* Revert "Fixes various radio issues (#25586)"

This reverts commit 9296564ab6.

* Revert "refactors radios to use proximity (#25303)"

This reverts commit 06db6bc004.

* One more bit that needed reverting.

* Begone, unnecessary file!

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-05-24 04:42:53 +00:00
AffectedArc07 03cca11f95 Init Sanity Unit Test (#25442)
* Init Sanity Unit Test

* Oops

* Update code/modules/unit_tests/init_sanity.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Makes noticeboard less silly

---------

Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-23 19:43:33 +00:00