cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 14:32:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,061 Commits 28 Branches 2 Tags
59ce9b5ead2f3bf4f013dfb3e75fd17157fe3aa5
Commit Graph

12095 Commits

Author SHA1 Message Date
Chap
59ce9b5ead [FIX] Prevent duplicate cyborg upgrades (#26731) 
* Disallows installing duplicate cyborg upgrades.

* Prevent duplicate Cyborg modules

* Unecessary spacing removed

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

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

* usr > user

* Move nodrop check into do_install

* ... Why did I do that?

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-10-09 10:47:19 +00:00
Contrabang
6faa31a307 Removes an unneeded proc (#26997) 
* Removes an unneeded proc

* yeea

* Update code/modules/mob/mob_misc_procs.dm

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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-10-08 16:51:30 +00:00
DGamerL
8d4f75d570 Removes a random proc that we don't use (#26982) 2024-10-06 23:34:48 +00:00
Contrabang
4833fea9a2 IPCs dying to brain damage (#26957) 2024-10-06 17:52:29 +00:00
Сиротка
b6f51c1f49 Nerf Space Loot (#26738) 
* Decrease Gamer loot in space

* Update depot_spawners.dm

* Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm

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

* Update depot_spawners.dm

* Update code/game/objects/effects/spawners/depot_spawners.dm

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

* Update energy_melee_weapons.dm

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@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-10-06 09:28:11 +00:00
Silverplate
b91fb66371 Event huds can now be found with ahud (#26916) 2024-10-02 15:17:47 +00:00
alos
8530ac4f9f Adds borgi undershirt (#26824) 
* 1.0.2 adds E-N undershirt as consolation prize

- adds E-N (Borgi, to Ian's Corgi) undershirt

* 1.0.2 adds E-N undershirt as consolation prize

- adds E-N (Borgi, to Ian's Corgi) undershirt

* 1.0.2 adds E-N undershirt as consolation prize

- adds E-N (Borgi, to Ian's Corgi) undershirt
 2024-10-02 15:17:27 +00:00
CRUNCH
e5320b5702 Creation (#26765) 2024-10-02 15:17:15 +00:00
Silverplate
2d58d8e3ad lowers succumb threshold to 130 damage (#26941) 2024-10-02 15:17:06 +00:00
PopeDaveThe3th
224d053282 Removes Princess of Terror RNG (#26910) 
* removes princess RNG

* Add files via upload

* Update princess.dm

* Delete spider.patch

* Update princess.dm

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

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm

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

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-01 22:52:31 +00:00
Chap
666713eb4d [FIX] Guardian health HUD now updates properly when host health changes (#26818) 
* Guardian health hud now updates properly

* Now with negative numbers!

* New signal

* remove non-functioning proc

* Update code/game/gamemodes/miniantags/guardian/guardian.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-01 16:44:40 +00:00
Qwertytoforty
c6f9a5ea9c You can now emag humans again (#26857) 
* You can now emag humans again

* Update code/modules/surgery/organs/organ_external.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-28 22:37:34 +00:00
leoworm
0f587202d0 Added shadowperson healing case for when inside locker (#26837) 2024-09-28 08:18:23 +00:00
Contrabang
900271af91 Updates OD lints (#26729) 
* yea

* update lints

* lint changes and code fixes

* i hate old code

* dont make this an error
 2024-09-27 17:02:16 +00:00
Contrabang
ee6f73973e Fixes problems with multiple sources of alpha on humans (#25884) 
* lets gooooo

* this too

* comments

* update code

* im so good

* tested, it works now

* Update code/game/dna/mutations/mutation_powers.dm

Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@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: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
 2024-09-26 18:06:44 +00:00
Chap
b26b47f275 AI can no longer boot pilots from a mech as non-malf (#26908) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-09-26 14:19:36 +00:00
Contrabang
8fd62f8702 Protects living damage variables (#26892) 2024-09-25 11:09:56 +00:00
Adrer
51c64edfc5 You can no longer put the cyborg gripper in a display case (#26848) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-09-22 23:01:23 +00:00
Adrer
7639848bad Offering ghost no longer runtime (#26853) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-09-20 08:43:53 +00:00
Adrer
a8668cce00 [FIX] Dead cats no longer chase mice (#26826) 
* Dead cats no longer follow mice

* Also stop chasing if the mouse is already dead

* No reason for these to not just be walk

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Adrer <erwin@lombok.demon.nl>

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-19 13:17:23 +00:00
meow20
a091516181 Administration tool: Build mode offer tool to quickly offer large amount of mobs. (#26712) 
* offer buildmode

* stops asking to show special role if already decided in build mode

* Update offer.dm

* minor oopsy

* linter crying

* Update code/modules/buildmode/submodes/offer.dm

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: meow20 <62257265+meow20@users.noreply.github.com>

* Update mob_misc_procs.dm

* Update code/modules/mob/mob_misc_procs.dm

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

---------

Signed-off-by: meow20 <62257265+meow20@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-09-19 10:46:53 +00:00
warriorstar-orion
63855ede3c fix: AI Eye movement runtimes (#26792) 2024-09-19 02:26:19 +00:00
Coolrune206
fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
Adrer
8d82546d9d [FIX] Mobs that were offered up to ghosts no longer get taken over by their old owners (#26650) 
* Grab_ghost now checks the ckey of the mind

* Remove superfluous loops for getting ghosts.

* Early return for MMI

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-09-16 14:39:54 +00:00
Qwertytoforty
9caf53b45a Hoverboards will now get cursed if used during megafauna (#26695) 
* Hoverboards will now get cursed if used during megafauna

* fix pixel offset

* Update code/modules/vehicle/tg_vehicles/scooter.dm

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

* Update megafauna.dm

* Apply suggestions from code review

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

* TIMER DEFINES

* Update code/modules/vehicle/tg_vehicles/scooter.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-16 02:49:43 +00:00
Christasmurf
1f9945ee5f Captain's sabre - Resprite and rebrand (#26592) 
* rapier-rebrand

* extdesc change

* indentation

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-12 17:24:14 +00:00
Adrer
f7472de36c [FIX] Floorbots now actually use the colour of the toolbox they were made of (#26730) 
* Floorbots now actually use the colour of the toolbox they were made of

* Remove random newline

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-09-12 16:59:46 +00:00
Daylight
965b42bf51 [FIX] Cult Shadow Shackles can now cuff people who are missing an arm. (#26707) 
* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
 2024-09-11 17:34:20 +00:00
warriorstar-orion
9a5db8f91e refactor: remove CanPass height arg (#26700) 2024-09-11 14:49:30 +00:00
DGamerL
e3c73110db Adds Chemical flamethrowers (#25091) 
* Initial work

* Good enough to open a PR out of draft

* Make these use the vars on the flamethrower

* Moar fixes

* Undefines define

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

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

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

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

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

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

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

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

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

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

* This won't compile

* GDN review

* Fixes CI

* Fixes CI even more

* 5 ammo per tile now

* Heavily nerfs adding multiple fires

* Adds phlogiston as a burnable reagent

* Fixes the fire name

* Placeholder sprite + ammo use fix

* Now in cargo partially

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Lewc Review

* Adds nuclear variant

* Adds the chem flamethrower to the nukie uplink, alongside ammo

* More fire armor tweaks

* GDN review

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

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

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

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

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* TEMPORARY PUSH

* Adds inhands

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

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

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

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

* Fixes inhands

* Makes air hot again

* Lewc review

* Audible messages and canister refilling

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

Co-authored-by: Burzah <116982774+Burzah@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: GDN <96800819+GDNgit@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: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-05 23:12:56 +00:00
BiancaWilkson
e0da59f5ea Borgs get flashed again (#26674) 2024-09-03 14:01:11 +00:00
PopeDaveThe3th
58c7fa9a0d Fairly Sizable Fed Lore Drop (#26600) 
* the fedening

* Federation -> TSF

* Update outfit_admin.dm

* Update outfit_admin.dm

* i forgor

* few more
 2024-09-03 13:04:56 +00:00
chuga-git
482089ec8c makes slimes clear target on death, and delete actions, and abort walking on destroy (#26621) 2024-09-03 13:03:41 +00:00
chuga-git
22c9f89e9e print_flavor_text no longer runtimes when dna is null (#26609) 2024-08-28 23:55:41 +00:00
Tourte-Yaya
1c284fc91b combat cyborg with a extinguisher (#26505) 2024-08-25 16:43:28 +00:00
Spaghetti-bit
3fd78491e6 Moving while buckled or while in a locker that is locked / welded will no longer reset resist timer. (#26523) 
* Moving while buckled to a surface will no longer reset the timer / cause you to fail.

* Properly applies the same principal to closets and secure lockers.

* Changes break out time to use the MINUTES define.

* Apply suggestions from code review

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-24 16:43:47 +00:00
1080pCat
b87120e548 Syndicake factory has power again. And the commando wont go crazy on its pet bunny. (#26554) 
* syndicake factory has power again

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

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-22 10:55:20 +00:00
Faron
1c3be1c3d5 Update undead.dm (#26564) 
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-08-21 01:35:43 +00:00
DGamerL
9d11e93e5a Cleans up last words (#26546) 2024-08-20 00:56:15 +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
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
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
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
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +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
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
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