cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-30 03:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
59,767 Commits 11 Branches 2 Tags
bcb00d3b4e2d5709aece4e12b691fb67e6812faf
Commit Graph

27554 Commits

Author SHA1 Message Date
Burzah
bcb00d3b4e Moves all Voting Messages to OOC Chat Tab + Updates OOC Chat Selector (#26544) 
* Adds interface to selectors for Info tab

* Moves to OOC - Adjusts Voting Classes

* Removes bolding
 2024-08-20 10:41:35 +00:00
DGamerL
9d11e93e5a Cleans up last words (#26546) 2024-08-20 00:56:15 +00:00
1080pCat
2b093fa438 You can now feel how hot the damage medbeam is. and slightly changes the description (#26439) 
* You can now feel how hot the damage medbeam is. and tweaks the description slightly

* updates the description a little more

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-08-19 21:20:37 +00:00
Blossom
348d45f561 Fixed the last word pop up window instantly killing you if you are fu… (#26507) 
* Fixed the last word pop up window instantly killing you if you are full health

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

Co-authored-by: Luc <89928798+lewcc@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-19 15:26:31 +00:00
Ryan
0104291682 Slaying Goliath: a Washing Machine and Dyeing overhaul (#26265) 
* Washing Machine Updates

* Dye Registry Improvement + Bug Fixes

* a couple bug fixes + beanie dyeing

* oopsie

* removes washing blacklist, it is unused

* Apply suggestions from Lewcc's code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* why is all my code fucking

* Update code/modules/clothing/gloves/colored_gloves.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* cleanup

* Update code/modules/clothing/gloves/colored_gloves.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* machine wash updates for simple animals

* Update code/modules/clothing/clothing.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* adds dyeing.dm documentation

* optimizations & visible_messages

* adds SIGNAL_HANDLER

* Update code/game/machinery/washing_machine.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* update comment

* cleans up cleaning_act()

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-19 09:38:47 +00:00
npukoJl
8fdb8a71bf Fixes Nanotrasen paper bin + now its tgui_alert instead of alert (#26484) 
* Fixed + now its tgui_alert instead of alert

* fixed as Aylong suggested

* forgor to remove Cancel from first check

* Update code/modules/paperwork/paperbin.dm

missing whitespace

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: npukoJl <71260144+MixerBaikalLover@users.noreply.github.com>

* add a null check on P

---------

Signed-off-by: npukoJl <71260144+MixerBaikalLover@users.noreply.github.com>
Co-authored-by: npukoJl <71260144+MixerBaikalLover@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-19 09:10:01 +00:00
Ryan
68f78d0dda Cleans up disposal chute power state changes to reduce the number of proc calls it makes throughout the round (#26447) 
* Updates disposal power changes

* oop
 2024-08-18 06:38:05 +00:00
Kenionatus
777910d6d2 replace magic numbers related to emp and explosion severity with defines (#26495) 
replace even more magic emp and ex numbers
 2024-08-18 03:11:22 +00:00
DGamerL
69a0848b0e Stops mice from eating cables during CI (#26496) 
* Stops mice from eating cables during CI

* WE TEST CI WITH THIS ONE

* Revert "WE TEST CI WITH THIS ONE"

This reverts commit e163eaf612.

* Comment

* Charlie review
 2024-08-17 23:31:13 +00:00
AffectedArc07
3a3768bac3 Using explosives at end round now gibs you (#26465) 
* Using explosives at end round now gibs you

* More tweaks

* Tweaks
 2024-08-17 22:24:21 +00:00
Arthri
494704e323 Set Ore Redemption Machines to use Low Priority Messages (#26444) 
* Refactor createMessage out of message server

* Change radio message

* Add reminder

* Fix linting errors

* Fix more linting errors

* Update priorities

* Add low priority icon

* Lower indent

* Fix switch statement

* Add low priority icon

* No reminders for low priority messages

* Update priorities in frontend

* Build and update /tg/ui

* Fix typo

* Clarify purpose of return

* [ci skip]

* Build and update /tg/ui

* [ci skip]

* Build and update /tg/ui

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
 2024-08-17 15:31:33 +00:00
Spaghetti-bit
4d66ba4aab General fix to update tint applying/removing blindness, tweak to facehuggers. (#26513) 
* Removes the blindness from Facehuggers and ties it to `update_tint()`.
`update_tint()` now properly removes and adds blindness.

* Removes unneeded overlay.
 2024-08-17 01:00:05 +00:00
HMBGERDO
fbe49dabbc Fixing blood spreading too much during surgery (#26266) 
* bloody blood

* ehhhh

* here too

* bloodwrite fix

* a

* review changes

* max blood amount to argument

* Update code/game/atoms.dm

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

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

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

* tab

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-15 23:51:48 +00:00
Kenionatus
6032712fab Fix Desk Bell Bugs (#26388) 
* Fix Desk Bell Bugs

Fixes a bug where a desk bell with a receiving signaler and another receiving signaler ended up in an infinite loop.
Fixes door bells not unregistering (code) signal handlers for removed (item) signalers

* remove superfluous comment

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Kenionatus <kenionatus@techie.com>

* Update code/modules/paperwork/desk_bell.dm

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

---------

Signed-off-by: Kenionatus <kenionatus@techie.com>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@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-08-15 23:42:08 +00:00
warriorstar-orion
90e52f70e8 refactor: Moves simplemob atmos and temperature requirements to DCS elements. (#25619) 
* refactor: elementize simplemob homeostasis

* undef these bad boys

* ugh

* Fix up comments

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

* update element var name

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

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-15 23:07:43 +00:00
Mikhail Dzianishchyts
de2380422f Fix cloak of the prophet not working if a broken mirror exists (#26476) 2024-08-14 17:40:25 +00:00
PopeDaveThe3th
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
LtDiggs
2929d490b4 Re-adds the Disk Compartmentalizer (#26460) 
* Re-adds the Disk Compartmentalizer

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com>

---------

Signed-off-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-08-14 14:38:57 +00:00
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Ryan
a00c687a01 Makes Passive Power Consumption Safer and Fixes Negative Power Issues on APCs (#26445) 
* Makes Static Power Safer & Fixes Negative Power Issues

* updates documentation & syntax

* updates disposal power changes

* Revert "updates disposal power changes"

This reverts commit b233aec45f.
 2024-08-13 09:46:44 +00:00
Adri
06ee8b97c0 Proto pulse slugs no longer immediately destroy reinforced walls (#26446) 
* Proto pulse slugs cannot immediately destroy reinforced walls

* uses ex_act defines
 2024-08-12 17:31:41 +00:00
Сиротка
fcbb1a590f Update gasmask.dm (#26454) 2024-08-11 08:50:46 +00:00
BiancaWilkson
8ee325ecd7 its always important to remain silent if you have nothing nice to say (#26431) 2024-08-08 21:16:55 +00:00
warriorstar-orion
2a3a84b438 refactor: Biohazard stats (again) (#26424) 2024-08-08 16:35:12 +00:00
chuga-git
af735ed400 Fixes flash check runtime when flashee does not have eyes (#26409) 
* fixes null runtime

* the ASCII code for " " is 32, or in 0x0020 in hexadecimal

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

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-08 16:11:56 +00:00
DGamerL
50edcb46b8 Makes emitter hits that didn't turn on the SM not get logged by investigate (#26375) 
* Silly mistake

* Easier solution
 2024-08-07 13:28:19 +00:00
CRUNCH
2c1fcbd7da Merges the Hug Module With the Cyborg Gripper (#26007) 
* Hugs

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

* AGHHH!

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

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cyborg_gripper.dm

* 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

* Update robot_upgrades.dm

* Update cyborg_gripper.dm

* Apply suggestions from code review

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

* Update robot_modules.dm

* Apply suggestions from code review

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

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

Co-authored-by: Burzah <116982774+Burzah@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: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-07 13:07:36 +00:00
BiancaWilkson
be27510c41 Fixes tether module being able to tether yourself (#26403) 
* turf check yippee!

* Update code/modules/mod/modules/modules_engineering.dm

Co-authored-by: 1080pCat <96908085+1080pCat@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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-08-07 07:53:29 +00:00
Migratingcocofruit
a0308e048a Fixes medical grippers not being usable in surgery (#26311) 
* Fixes medical grippers not being usable in surgery

* Adds a new trait for tools that behave like an open hand  in surgery. uses that instead of a typecheck.
 2024-08-07 00:02:03 +00:00
chuga-git
5ad66a3d55 \ref -> UID (#26410) 2024-08-06 20:41:58 +00:00
warriorstar-orion
78ef86989f Fix: Bespoke DCS elements use all requested args. (#26387) 2024-08-06 19:29:39 +00:00
Spaghetti-bit
52327cea40 [TWEAK] Runechat Color Preference and Species Dependent Organ (runechat) Removal (#26018) 
* Reopens runechat color tweak.

Fully changes how the runechat color works with human mobs.

- Ties Runechat color to DNA (unchangable via scramblers, or other methods like DNA modifying)
- Runechat color is now a preference based thing and can be changed at mirrors.

* Linter mint

* Comment for comment's sake + Rerun cerestation CI/UNIT test because mouse ate a cable.

* augh

* reverts toml

* Fixes a SQL query, good for final review.

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-06 13:15:47 +00:00
Kyani
6fd371efd9 Update organ_external.dm (#26396) 2024-08-05 18:38:12 +00:00
CRUNCH
bccf624639 Adjusts IPC Adrenals to be Like Regular Adrenals - Robotic Equality Update! (#25903) 
* Robot equality!

* Update medicine.dm

* e

* Update drugs.dm

* normalise drugs

* normalises medicine

* Update medicine.dm

* Update medicine.dm

* Update medicine.dm

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

* update based on suggestions

* Update medicine.dm

* Update medicine.dm

* Apply suggestions from code review

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

* 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>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-05 18:27:37 +00:00
BeagleGaming1
5d9b6067a8 Update cell.dm (#26392) 
Signed-off-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
 2024-08-04 18:00:52 +00:00
Migratingcocofruit
b1192460e4 BSH update (#26032) 
* MOAAAAAR POWEEEEEEER

* base points are per level again. reduced to 2

* Style changes, spaghetti is now in a box and the alert logic has been tidied up

* Stabilizer and Autoshutoff buttons are now stuck in the off position when emagged

* Rebuild TGUI

* Rebuild TGUI

* rebuild tgui

* Emag now forces highest level possible

* Rebuild TGUI

* Portal amount no longer dependent on stabilizers. Stabilizers no longer stabilize when off. Portal spawning message now only plays if there are no portals currently spawned to prevent spam when auto shutdown is disabled. Warning message now correctly indicates auto shutdown is disabled. Improved Readability

* corrects a comment

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-04 17:10:43 +00:00
Faron
4831c0624f Adds an abandoned security shuttle space ruin (#25922) 
* Update cell.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update medbeam.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update crates.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update mob_spawn.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update undead.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_ruins.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_areas.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update medbeam.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_ruins.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update undead.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update mob_spawn.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abandoned_sec_shuttle.dmm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_ruins.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update cell.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/crates.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update crates.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update medbeam.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update medbeam.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abandoned_sec_shuttle.dmm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update config.toml

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update effects.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update particles.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update medbeam.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update effects.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_ruins.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_ruins.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/projectiles/guns/medbeam.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update space_areas.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Add files via upload

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-04 10:09:08 +00:00
DGamerL
2f591a301c Makes people on skateboards unable to pull things (#26191) 
* Makes people on skateboards unable to pull things

* Removes duplicate definition

* Contra review
 2024-08-04 09:07:03 +00:00
CRUNCH
7e09585464 Gives Most High-Risk Items Extended Descriptions (#25630) 
* LORE!

* MORE LORE!

* Update code/modules/hydroponics/gene_modder.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update krav_maga.dm

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

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

* Update nuclearbomb.dm

* Apply suggestions from code review

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* NAD

* Update teleportation.dm

* Update armor_suits.dm

* 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

* Update robot_upgrades.dm

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update documents.dm

* Update magboots.dm

* very minor edits.

* Apply suggestions from code review

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

* update

* Update armor_suits.dm

* Apply suggestions from code review

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

* format

* Update code/modules/hydroponics/gene_modder.dm

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

* Update defib.dm

* Update armor_suits.dm

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-04 08:05:38 +00:00
warriorstar-orion
19d720450d fix: Autoapply disposal sort junction names. (#26377) 2024-08-04 08:03:04 +00:00
DGamerL
a21b962ee6 Flash refactor and rebalance (#25852) 
* Flash refactor and rebalance

* Maps

* Update code/game/objects/items/devices/flash.dm

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

* Update code/game/objects/items/devices/flash.dm

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

* Contra review

* Update code/game/objects/items/devices/flash.dm

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

* Lewc Review

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-04 07:55:17 +00:00
Taurtura
03502a2a88 should have done that from the beginning (#26381) 2024-08-03 16:00:05 +00:00
Spaghetti-bit
6837ea7333 Caterpillars and Nymphs that evolve no longer provide blood to vampires and cannot be culted (#26174) 
* Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires.

* Improves comments and changes the trait name.

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-03 00:07:33 +00:00
Mikhail Dzianishchyts
d14a220023 Bring emitter locking back (#26374) 2024-08-02 19:48:57 +00:00
Spaghetti-bit
aeb4395001 A high enough tint will blind you. You can no longer be flashed or blinded further if you have broken eyes. (#26338) 
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-02 18:13:12 +00:00
DGamerL
54b0c33144 Hahahahahahhaha (#26371) 2024-08-02 00:24:50 +00:00
Qwertytoforty
b1432d3039 fix rigged powercell for modsuits (#26342) 
* fix powercell for modsuits

* Update code/modules/mod/mod_core.dm

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

* Update code/modules/power/cell.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-08-02 00:02:57 +00:00
DGamerL
44671e31e8 Adds: The C-Foam launcher (#25738) 
* The start

* Getting a bit further

* Slight ammo casing update

* Istype helper and foam blockage

* Adds status effect

* Foam blockage and status effect fixes

* Autolathe ammo + stun

* aaaaaaaa

* Adds uplink item

* Actual slowdown

* Makes attacking a bit faster again

* Ammo increase to 12

* Sirryan review

* Adds sprites - almost working

* Lots of fixes + mineral doors

* Mineral doors don't open with foam
 2024-08-01 06:24:09 +00:00
1080pCat
ca79f65c8d Adds a missing | to the player panel after "make super hero" (#26353) 
* Hold my brain, brain holder.

* Update misc_admin_procs.dm

* woops
 2024-08-01 01:01:55 +00:00
Contrabang
7b35161242 Adds CI for simple pipe and unary connections (#26340) 
* Adds CI for missing pipe connections

* fix box

* fix delta

* fixes meta

* partially fixes cere

* yah

* cere fix

* holy shit

* adds unary stuff too

* im dumb

* yeah
 2024-07-31 18:31:18 +00:00