cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 09:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,102 Commits 28 Branches 2 Tags
eca1df9ce54371c775b0f94078df2e4df8de8f56
Commit Graph

10775 Commits

Author SHA1 Message Date
Christasmurf
0db4c22804 Cargo Technician resprite + some hazard vests (#25399) 
* cargotech and hazard vests

* deliveryboy and bomberjacket

* explorer merge changes
 2024-05-29 13:40:08 +00:00
Migratingcocofruit
88d236d5c9 Adds saltpetre crystals, which grind into saltpetre (#25050) 
* Added saltpeter crystal, a way to make them, and sprites.

* comment changes

* forgot to undef

* actually undefing this time

* raises saltpeter crystal yield when ground to 8

I did some play testing and it simply takes too many clicks to pump in the ammonia required to get the amount of saltpeter you need.

* The compost bin being full of compost no longer hinders your saltpetre production

* rebuild TGUI

* Allows the compost bin to accept ammonia directly from plants that contain it

* adding the K back to KNO3

* Minor ui adjustments

* Compost bin can use ash now

* I am made of stupid.

* fixing a tiny little offset in the biomass bar

* Icon update, new description for Saltpetre crystals, style fixes and recompile tgui

* period

* minor changes

* rebuild TGUI

* Apply suggestions from code review

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

---------

Signed-off-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-05-28 14:34:17 +00:00
Matt
542a21d690 Fixes oversight with spraycan (#25513) 2024-05-28 13:24:27 +00:00
dj-34
1508292b61 Adds Ctrl Shift Click to radio, fixes issue with uplink (#25637) 
* Adds Ctrl Shift Click to radio, fixes issues with uplink & beacon

+ Review updates

* Review update 1
 2024-05-28 01:22:37 +00:00
Сиротка
094d7bd13b Fix undestrictible armor from attachable armor (#25608) 
* Fix undestrictible armor from ataacable armor

* also fix ash hide comsumption
 2024-05-27 14:56:07 -05: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
Сиротка
c9f44b1f29 Improve mecha circuit crates to make them useful + few fixes (#25516) 
* Improve mecha circuit crates to make them useful

* fix

* Update ripley.dm
 2024-05-27 16:42:02 +00:00
Rayforx
2b9ccda51b Proto adrenalin price changes and one use adrenalin (#25475) 
* Adrenal changes

* Update code/datums/uplink_items/uplink_general.dm

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

---------

Signed-off-by: Rayforx <154929127+Rayforx@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-05-27 16:35:18 +00:00
PollardTheDragon
2f8db520c7 No! Bad AI! No Tracking on the Research Post! (#25467) 2024-05-26 19:42:23 +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
PollardTheDragon
fbfd1bf82a Gives Golems access to Xenobiology (#25484) 2024-05-24 20:08:34 +00:00
DGamerL
624a1261f8 Makes adrenals no longer have a chance to addict you (#25479) 
* A new no addiction omnizine

* Adds to the blocked chem list
 2024-05-24 20:01:27 +00:00
Migratingcocofruit
2903560dc1 Pipe fix/tweak (#25431) 
* Pipe fixes and tweaks.

Allows refilling of pipes using dried plants, removes their ability to conjure nicotine, and applies the  May 22, 2015 pipe tweak to cob pipes, and make them start empty(corn has no nicotine).

* refilling pipes now sets smoketime

* oops

* Adding spaces to comments
 2024-05-24 18:30:45 +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
Luc
23ad8a48fa Adds true observing -- letting you see what your target sees (#24855) 
* bring it back now y'all

* adds a bunch of other changes

* pretty much works at this point

* grep

* Fixes some bugs, still chasing some down

* Add observers to recursive mob check, ensuring they can see messages from their orbitted atom

* tidy some things up

* resolve

* remove unnecessary checks

* Address todos, minor cleanups

* oh dear

* initial testing

* Fix some vulnerabilities (oops)

* Fix some other bugs from testing

* ci fixes

* Add some contingencies against clicking things you shouldn't

* fix some noted bugs

* Add observe to admin jump, improve messaging

* add a few more fixes that should mostly address some runtimes

* oh this wasn't really great

* one last thing

* Fix suit inventory problem

* Remove merge artifact

* Add some missing parens

* Prevents you from observing other ghosts, and should fix the getting stuck outside of your body issue.

* we love testing

* adds to player panel

* Fix more bugs with observers getting stuck outside of their body

* cleans up player panel, verb offerings

* shit

* Update code/_onclick/hud/alert.dm

welp

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Fixes some targeting issues

* Fixes targeting on aobserve

* Fix some weird storage bugs

* clean up some doulbed up follow links

* Update code/modules/admin/player_panel.dm

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Adds some checks for ghost observe

* Remove mentor debug log

* ahhhhhhhhh that'll do it

* Cleans up some additional checks that were not quite what they should have been

* better logging, too

* mochi review

* one more thing

* Gets robot huds mostly working

* hopefully fix folks not getting observe

* Fix order of operations causing a runtime on qdeleting

* Remove some unnecessary stack traces

* Apply suggestions from code review

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Fix bug with items in your inventory disappearing on changing HUD modes

* Fix some bugs with the observe verbs

* possibly fix nullspace issues

* funny review

* missed one

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-05-23 15:46:43 +00:00
CRUNCH
7bf45dce58 Gives the RCD a unique suicide act (well, 2 or 4, depending on how you look at it) (#24496) 
* RCD Suicide Time

The most suicidal item in SS13 now!

* Do not dust the items thanks

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* code compaction

* Update RCD.dm

* Update code/game/objects/items/weapons/RCD.dm

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

* Update RCD.dm

* Update RCD.dm

* Update RCD.dm

* Update code/game/objects/items/weapons/RCD.dm

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

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update RCD.dm

* The worst typo in history

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update RCD.dm

* missed perception check

* Refactor RCD actions.

* Death message.

* Removes magic numbers

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Makes everything work

* Update RCD.dm

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update RCD.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update RCD.dm

* Update code/game/objects/items/weapons/RCD.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
 2024-05-23 11:10:50 +00:00
Сиротка
ccf5ef4fc4 Nanopaste now can repair mecha (#25251) 
* Nanopaste now can repair mecha

* Update nanopaste.dm

* refactor mech code

* fix

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update nanopaste.dm

* Update nanopaste.dm

* Update nanopaste.dm

* Update nanopaste.dm

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update nanopaste.dm

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/mecha/mecha.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-23 00:57:37 +00:00
dj-34
7a0d4bb089 Fix ppflowers (flora) generate missing icon (#25553) 2024-05-23 00:20:58 +00:00
Charlie Nolan
3b351c8636 Nanotrasen Chefs have now officially gone to Chef College (#25066) 
* chef buff

* comments and crap

* blam

* revert

* s34n review

* last review

* Reduced expert chef cooldown to 5s.

* Renamed things for clarity.

* Moved Expert Chef Knowledge to IC

* Don't use a Oven, use an Oven.

* Made kitchen machines less egotistical.

* Gave Expert Chef Knowledge a spell.

* Apply suggestions from code review

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

* Less demanding background.

* Removed verb decoration and STATUS_USED_EXPERT_CHEF

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Changed trait name.

* Lint

* Apply review comment.

* Remove master-removed panel var

* Update code/modules/mob/living/carbon/human/human_mob.dm

Signed-off-by: DGamerL <108773801+DGamerL@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: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-22 00:29:40 +00:00
GDN
06db6bc004 refactors radios to use proximity (#25303) 
* refactors radios to use proximity

* 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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-22 00:17:26 +00:00
Qwertytoforty
e7ecbda4bf health scanners no longer say slime people have no heart (#25498) 
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-21 22:23:39 +00:00
matttheficus
ac84655df6 Radio Hotmic Noise + Alt Click Toggle (#25239) 
* radio check - lime charlie

* examine addition

* oops

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

* oops 2

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

* dgamerl review

* i didnt save lul

---------

Signed-off-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
 2024-05-19 10:13:04 +00:00
Aylong
1409c03463 [TGUI] Noticeboard (#25095) 
* [TGUI] NoticeBoard

Well... that's... something?

Little animation

Update tgui.bundle.css

Pretty laggy animations

More design

Revert inset shadow

Polishing

You can craft it now

Wrap this shit

RMB func

* Polish

* Review changes

* Rebuild rebuild rebuild...

* Rebuild TGUI

* Unwrench it
 2024-05-17 17:27:10 +00:00
DGamerL
f8f34e64df Adds explosion particles! (#25410) 
* Adds explosion particles

* Adds back the smoke explosion system

* Removes whitespace

* Fixes CI

* Adds TGMC explosion

* Fixes explosions, removes smoke explosions

* More particle tweaks

* Removes a random extra kickup

* Fixes CI by properly removing kickups
 2024-05-17 13:19:21 +00:00
Qwertytoforty
b557dabad1 C4 now takes 1.5 seconds to attach to an object. C4 is now directional. (#25361) 
* C4

* C4's are now directonally hidden behind walls / doors
 2024-05-17 12:53:08 +00:00
Сиротка
b216289b41 FEAT: Two new attachable armor for Ripley (#25231) 
* FEAT: Two new attachable armor for Ripley

* Delete mecha 32x48.dmi

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

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

* Add defines into separate files, change descriptions a bit

* fix

* change (loc) to get_turf(src)

* mecha

* edit defines

* Update leather.dm

* Update code/game/mecha/working/ripley.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update leather.dm

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update mechfabricator_designs.dm

* fix .dmi

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/mecha/working/ripley.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update ripley.dm

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

* Update code/game/objects/items/stacks/sheets/leather.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-17 12:45:32 +00:00
CRUNCH
1933d2fab3 Refactors borg grippers, service now has a specialized gripper. (#24596) 
* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Most of the stuff

Most of the refactor. Needs to fix medical borg doing shrapnel extraction.

* Forgot this

* fixing space intent

* Newline

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* More improvement

* CI fixes

* GO AWAY SPACE INDENTATION I DIDN'T PUT YOU THERE AAAAA

* oops mb mb

* Makes this work with ebba's PR

* get dat fokkin disk

* Update cyborg_gripper.dm

* Removes all nuclear stuff

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update cyborg_gripper.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update cyborg_gripper.dm

* coin flipping

* Update cyborg_gripper.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Apply suggestions from code review

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

* EOL comments no longer EOL

* autodoc

* Update cyborg_gripper.dm

* can hold all

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Oh hi mark!

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Line split

* Some comments, examine().

Examining a gripper now tells you what's inside.

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@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-05-17 12:43:06 +00:00
BiancaWilkson
ad48f54c60 [S] Fixes an exploit (#25502) 
* you have no idea what it took to make this commit

* Update code/game/objects/mail.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-05-17 12:32:39 +00:00
warriorstar-orion
94b7057989 tube stations can be skipped by holding direction key (#25350) 
* tube stations can be skipped by holding direction key

* Update code/game/objects/structures/transit_tubes/station.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* invert/guard clause

* add examine text for hints

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-05-17 11:58:36 +00:00
CRUNCH
66e3528b7c Adds Abductor Janitorial Tools! (#25057) 
* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Out of this world cleaning!

* missing empty space

* Locker belt

* fix merge conflict and upgrade belt

* Update code/modules/research/designs/mechfabricator_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/modules/research/designs/medical_designs.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update medical_designs.dm

* Update code/game/objects/items/robot/robot_upgrades.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Fixed missing item state

* Begone, bucket!

* Update code/game/objects/structures/mop_bucket.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-17 11:22:14 +00:00
Qwertytoforty
be44430c83 Tarot statue time fix, no longer can emote or pda as a statue (#25461) 
* Tarot statue time fix, no longer can emote or pda as a statue

* oops

* Update code/game/objects/structures/crates_lockers/closets/statue.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-05-16 19:23:25 +00:00
Qwertytoforty
2ce4c20515 Adds the Lance emergency shuttle (#24806) 
* WIP: Adds the Lance emergency shuttle

* untodo

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* c-c-c-changes

* Apply suggestions from code review

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

* Update code/datums/shuttles.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2024-05-15 14:13:51 +00:00
AffectedArc07
69f20e250b Removes Nanomob (#25417) 
* Nukes nanomob

* Forgot this

* Update code/modules/client/preference/loadout/loadout_general.dm

Co-authored-by: GDN <96800819+GDNgit@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: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-14 09:29:38 +00:00
GDN
11f0f3b388 makes flash range on explosives actually do something (#25378) 
* owie owchie my eyes

* todo obliterated

* Update code/game/objects/explosion.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-05-13 04:24:07 +00:00
Luc
d25ba20e32 Moves pre-round observers to the wizden (#25330) 
* let's see if people like this

* Update code/game/objects/effects/landmarks.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/effects/landmarks.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-10 19:35:58 +00:00
GDN
19b34fcb28 c4 can now be used on all mobs when unconscious or dead (#25379) 
* c4 can now be used on all mobs when unconscious or dead

* Update code/game/objects/items/weapons/explosives.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-05-10 14:09:05 +00:00
GDN
10e32fd380 fixes particle holders not naturally gcing (#25438) 2024-05-09 01:14:33 +00:00
McRamon
3a5d0a152f Succesful heist (money resprite) (#25373) 
* first sprite check

* gooners-be-gone

* code

* time to see
 2024-05-07 07:17:26 +00:00
Probablyjay19
a45fc0bbdb Removes toddler dolls because it's just a bad idea (#25288) 
* Removes toddlers because it's just a bad idea

* puts some text back that wasn't actually for toddlers

* removed the baby
 2024-05-07 02:34:40 +00:00
DGamerL
b04bdf4ff9 Adds bullet impact particle effects! (#25177) 
* Initial commit

* Cleaning up + more debris

* Adds missing trailing newline

* CI doesn't like these and starts an infinite loop it seems

* Hacky solution? I call it fixing CI

* Final fixes
 2024-05-06 19:44:14 +00:00
Qwertytoforty
a750e3596e derails the acid peel train, acid peels no longer fit in trash bags (#25321) 
* derails the acid peel train

* le sigh
 2024-05-06 19:34:03 +00:00
matttheficus
a43944fc39 Splits Up Chameleon Kit (#25238) 
* cham gear tweaks

* non-cham mask

* Henri Review

* henri review 2: electric boogaloo
 2024-05-06 19:30:50 +00:00
BiancaWilkson
eb50355daf fixes a path (#25382) 2024-05-06 03:14:50 +00:00
Charlie Nolan
64e2395bff Made RCD code more efficient. (#25383) 2024-05-05 13:09:48 +00:00
Qwertytoforty
9ae66dd496 You can no longer see hud / screen when asleep. DOESN'T AFFECT BLINDNESS (#24360) 
* You can no longer see hud / screen when asleep

* oh fuck the huds

* Update code/_onclick/hud/robot_hud.dm

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

* storing when looking into a bug

* more tweaks

* Initial screen object fixes

* fix for old screen types

* animation my dear watson

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-05-05 09:42:12 +00:00
Luc
1823eff1b5 Fixes a bug that prevented RCDs from rapidly constructing or deconstructing anything (#25380) 
* rcds can do what they say on the tin

* a
 2024-05-05 04:32:42 +00:00
Charlie Nolan
df9dd0c13c RCD refactor (#25062) 
* Refactor RCD actions.

* Go away, silly defines.

* Apply suggestions from code review

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Review comment from GDN.

* Apply suggestions from code review

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

* Don't locate me, bro.

* More review stuff.

* Even more review stuff.

* Hi, DGL

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-05-05 02:33:22 +00:00
CRUNCH
654a48ab86 Xenoborg flash no longer disappears when burning out. Removes nonfunctional spray. Alters some descriptions for xenoborg items. (#25281) 
* Alters some xenoborg stuff

* oops

* Update code/game/objects/items/weapons/alien_specific.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* removes commented code

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-05-03 14:41:34 +00:00