cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

27734 Commits

Author SHA1 Message Date
DGamerL 1ae53f2126 Reverts a tweak (#26188) 2024-07-08 12:30:50 +00:00
Charlie Nolan 7b357f59ed [s] Refactor Cream-Master UI handling. (#26187) 
* Refactor Cream-Master UI handling.

* Playsound TRUE

* Lint
 2024-07-08 11:06:42 +00:00
DGamerL 5e7b0c0971 Changes even more uses of stat comparisons to use the defines (#26154) 
* First wave

* Second wave

* Last wave

* Apply suggestions from code review

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

* We love signals in this household

* Revert "We love signals in this household"

This reverts commit 75fe8d46a3.

* Update code/game/machinery/camera/tracking.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/machinery/camera/tracking.dm

Co-authored-by: Charlie <69320440+hal9000PR@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: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-07 22:57:01 +00:00
Aylong d118388ad8 Fix: Active mousetrap inhand sprite (#26176) 2024-07-07 22:45:56 +00:00
McRamon 14a7b74c2a Dredd armor resprite - finally deconflicted (i hope) (#26167) 
* human sprites

* спрайты хуяйты

* spritesheets

* indentation my ass

* accidental duplicate removed

* deconflictingingingingingikng
 2024-07-07 13:11:31 +00:00
HMBGERDO 67353fd62a Fixing fulton pack not working (#26153) 
* if the item has no damage, it is not autoblocked.

* armor check first

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

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

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-07-07 05:48:08 +00:00
Faron f1e98f745a Update medical_designs.dm (#26159) 
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-07-07 00:02:32 +00:00
Spaghetti-bit fdcbfc42bb Fixes a very small oversight with blood DNA. (#26172) 2024-07-07 00:00:50 +00:00
Kyani 04949b4a5e Newspaper bap fix (#26112) 
* ddsadsa

ddsadsa

* Update pet.dm

* Update pet.dm

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* early returns

* early returns

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

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

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

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

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

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

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
 2024-07-06 21:29:06 +00:00
HMBGERDO 7764d13257 Makes TGUI strip menu size toggleable (#25763) 
* toggleable fullsize strip menu

* name.

* TGUI rebuild

* tgui rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild
 2024-07-06 08:42:40 +00:00
tipoima 608b4223b9 Adds a traitor rapid healing item: "Hyperregenerative Medipen" (#26033) 
* Adds Hyperregenative Medipen to traitor uplink

* remove rogue pixel

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/modules/reagents/reagent_containers/hypospray.dm

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

* Cuts iron, sanguine, and spaceaccil from the medipen

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

---------

Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-06 08:38:17 +00:00
DGamerL f5bb6d1fb4 Nanocalcium pens now inject 10u of epinephrine (#26034) 
* Adds epi to nanocalcium

* Actually add volume

* Now 10u
 2024-07-06 08:35:43 +00:00
RomainzZ e386cfd9bf Lamp Bloom, Exposure and Glare (#24534) 
* Light Update

* Not failing tests I hope

* Whitespace Removal

* Tweaking here and there

* Merge Conflict Fix

* Rebuild TGUI Bundle to Fix Merge Conflict

* Settings are now in "Game Preferences" too

* ColorMatrix formatting and removal of unused procs

* A little mistake on matrices

* A little mistake x2 (last I hope)

* Moving Glare under every other effect, tweaking values, playing with blending

* Update TGUI Bundle for Merge Conflict

* Apply suggestions from code reviews

* Fuck it, it just works

* No tabs cool

* Remove unused

* Am I retarded

* We better return

* Whitespace we need

* oh

* New SQL update version

* Missing comma fix and recompiled tgui.bundle

* Updating SQL version in misc_defines and config

* Remove datum in holder

* BloomEdit empty lines removal

* No more unneeded functions calls

* Tgui.bundle rebuild

* SQL Changes

* SQL Version = 56 now

* Documentation and some formatting

* tgui.bundle.js rebuild

* Remove unused layers and variables

* Allow cameras to render backdrops

* Possible runtime issue fix

* Remove "baked" bloom from the lamps

* Revert the "remove". Make it low on alpha channel

* Shuttle rotation light update fix

* We don't need this

* Possible runtime issue fix x2

* tgui.bundle.js update

* tgui.bundle.js update

* tgui.bundle.js update

* Revert config.toml changes

* Revert the revertion of config.toml changes

* Bring that config changes back!

* Entry added

* tgui.bundle.js update

* Prettier possible fix (?)

* Runtime fix (and broken tubes now have light after reinstalling them)

* config update

---------

Co-authored-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
 2024-07-05 21:16:16 +00:00
Kyani c926b786e8 Fruit Salad Snowcone Tweak (#26117) 
* Update recipes_microwave.dm

* behold, perfection

* oopsie
 2024-07-05 17:58:30 +00:00
Adrer 58137cd7b8 [FIX] It's possible to pick up stuff behind tables again (#26144) 
* Replica syndicate space suit sprites

* Revert "Replica syndicate space suit sprites"

This reverts commit 1fb5cf68ac.

* You can grab stuff through tables again

* I must please the linter

* Morgue trays as well

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-07-05 17:57:20 +00:00
Adrer d0ebe2f37e You can throw stuff over tables again. (#26110) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-07-04 10:57:54 +00:00
warriorstar-orion 0dc3f30c32 fix: set area poweredness for many ruins. (#26101) 
* Fix area poweredness for many ruins.

* hivebot mothership too

* and druglab, argh

* give it a bump
 2024-07-03 03:56:11 +00:00
Spaghetti-bit 3e46e525da Changelings now update their flavor text upon transforming. Updates DNA to include flavor text. (#26094) 
* Fixes https://github.com/ParadiseSS13/Paradise/issues/3352

* bleugh
 2024-07-03 03:55:13 +00:00
McRamon cc8aa14e9f Greyman Henley - Alternative to tacticool (and Dexter reference) (#26031) 
* sprites for test

* fixic

* species

* icon state

* fixies

* loadout and vendor

* palette update

* color update
 2024-07-03 03:47:01 +00:00
Qwertytoforty 9dcf6ee91c Fixes easy slaved non golems. Fixes syndicate MMI abuse (#26020) 
* Fixes easy slaved non golems. Fixes syndicate MMI abuse

* Update code/modules/surgery/robotics.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-07-03 03:44:15 +00:00
chuga-git e4f2f8be80 Fixes runtime with ridable element and adds unit test for bespoke elements (#26111) 
* fixes bespoke elements with default indexes, adds unit test for detecting this

* lewc review
 2024-07-02 20:25:00 +00:00
McRamon e8eabf3014 Pimp coat (#26122) 
* mob sprites

* imcoder

* i am too tired to name these commits

* woof

* who let the dogs out?

* 3 > 1

* i hate git
 2024-07-02 17:53:16 +00:00
BiancaWilkson 47324d867f You can cancel out of pandemic printing now (#26107) 2024-07-02 00:17:32 +00:00
Aylong bf59a0c4f0 Remove a duplicate TGUI input toggle (#26096) 2024-07-02 00:08:42 +00:00
Spaghetti-bit 943cf41bc0 [FIX] Fixes floating blood on non-existent hands: My damn feet and hands are bloody! (#26100) 
* Fixes https://github.com/ParadiseSS13/Paradise/issues/7596

* Revert "Makes our time defines use strict numbers instead of nested defines (#26069)"

This reverts commit 19cbfb129a.

* Comments!

* Revert unintended change

* Actually reverts.... missed an *

* Remove S, update comment.

* Adds checks for hands and feet, making sure you don't have invisible blood.

* Reverts unintended changs.

* Mysterious.

* Die unintended change, die!

* Version one, needs pixel shifting, code works.

* Splits hands and feed, leaves shoes / gloves in the case something has shoes / gloves on

* Left! not Right!

* unintended revert

* Apply suggestions from code review

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-02 00:04:17 +00:00
Luc a5c13f066e adds a copy button to fill mode (#25997) 2024-07-01 23:29:28 +00:00
Adrer 6738775be2 [FIX] You can now throw chem grenades (And some other things) further than 1 tile again (#26105) 
* Fix throwing for a couple of items

* Not watertanks

* Or backtank fire extinguishers

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-07-01 23:07:26 +00:00
Faron e136be0f64 Makes the Voyager space ruins reward accessable (#26093) 
* Update voyager.dm

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

* Update voyager.dmm

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

* Update voyager.dm

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-07-01 23:05:34 +00:00
Qwertytoforty 16b399e504 fixes phasing through the skateboard (#26104) 2024-07-01 23:02:00 +00:00
Luc 77253c5ae7 Gives Surgical Drapes a Use (#25686) 
* Gives drapes some utility for starting surgeries

* Adds a nice helping of drapes throughout the codebase

* add icon, realize I didn't think that through

* Handles blood with signals

* whoopsie daisy

* range

* how about borgs

* Apply suggestions from code review

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

* burza suggestion

* more dgamer reviews

* Oops

* Update code/modules/surgery/surgery.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-01 19:01:17 +00:00
warriorstar-orion 87e6460c58 fix: allow airless chute flushing of small items (#26037) 2024-07-01 18:55:57 +00:00
Paul 61f970b7ce remove unusual entries from circuit imprinter, unify new entry & existing board as Air Sensor Monitor (#26013) 
Co-authored-by: Paul Merkamp <pmerkamp@butler.edu>
 2024-07-01 18:55:54 +00:00
CRUNCH 3721e5328d Armour (#26019) 2024-07-01 18:55:51 +00:00
CRUNCH ce5f820181 Adds the Research & Development Crate - For Continuing Science After the End of the World (#25990) 
* Update pack_science.dm

* BOX
 2024-07-01 18:55:47 +00:00
SchrodingersWolf fba88fb9b5 Adds the Everfull Mug ito tendril loot and also the wizard space ruins (#25924) 
* Chaplains in shambles

* Applies suggestion from Sirryan

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

* Replaces Inferno clusterbang with Everfull

* Removes unnecessary whitespace

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

---------

Signed-off-by: SchrodingersWolf <108938550+SchrodingersWolf@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-07-01 18:55:44 +00:00
Qwertytoforty a7b71d465c Fix glass tables. Fix crafting. lower price / stun (#26062) 
* Fix glass tables. Fix crafting. lower price  / stun

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

* 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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-01 18:54:57 +00:00
Charlie Nolan 92889190f4 Prevent maintenance drones from using chem dispensers. (#26058) 
* Prevent maintenance drones from using chem dispensers.

* emagged, message
 2024-07-01 06:18:14 +00:00
Spaghetti-bit dcca2fcdff [FIX] Humans no longer have socks when they're missing either leg: My socks got knocked off! (#26099) 
* Fixes https://github.com/ParadiseSS13/Paradise/issues/7596

* Revert "Makes our time defines use strict numbers instead of nested defines (#26069)"

This reverts commit 19cbfb129a.

* Comments!

* Revert unintended change

* Actually reverts.... missed an *

* Remove S, update comment.

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

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-01 05:58:54 +00:00
CRUNCH 520edf94c2 Borgs Can Empty Grippers Into Disposals - Adds Blind Messages (#25773) 
* Update disposal.dm

* Update disposal.dm

* Update disposal.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 disposal.dm

* Update code/modules/recycling/disposal.dm

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

* Update code/modules/recycling/disposal.dm

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

* Update code/modules/recycling/disposal.dm

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

* 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 disposal.dm

* Update disposal.dm

* Update code/modules/recycling/disposal.dm

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

* Update disposal.dm

* Update disposal.dm

* Update disposal.dm

* Update code/modules/recycling/disposal.dm

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

* Update disposal.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-01 04:30:55 +00:00
Gaxeer 32e46c02aa refactor: rename action button appearance related variables and procs to be clearer (#25658) 
* refactor: make action appearance creation more straightforward

* some adjustments

* fix: adjust action icons to refactor
 2024-07-01 02:29:31 +00:00
Migratingcocofruit 49599aa2f6 more healing reagent no longer means less healing (#25785) 
The first 20 units now do the normal touch reaction with the rest splashing instead of it being done only for 20 units and below
 2024-07-01 02:16:21 +00:00
Faron 340d8a3731 Update to restraints (#25831) 
* Update carbon_procs.dm

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

* Update items.dm

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

* Update handcuffs.dm

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

* Update humanoid.dm

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

* Update human_mob.dm

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

* Update status_effects.dm

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

* Update neutral.dm

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

* Update blood_magic.dm

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

* Update abduction_gear.dm

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

* Update items.dm

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

* Update abduction_gear.dm

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

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/objects/items.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/gamemodes/cult/blood_magic.dm

Woops.

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

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

* Update handcuffs.dm

The consequences of my actions

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

* Update humanoid.dm

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

* Update carbon_procs.dm

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

* Update clothing.dm

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

* Update human_mob.dm

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

* Update code/modules/mob/living/carbon/alien/humanoid/humanoid.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/carbon/human/human_mob.dm

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

* Update carbon_procs.dm

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

* Update handcuffs.dm

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-01 02:14:52 +00:00
DGamerL 6f0f9a2e9c Various fixes for xenomorph logging (#26006) 
* Various fixes for biohazard logging

* Better ways of counting xenos
 2024-07-01 01:35:33 +00:00
CRUNCH 39000c7b0c Update diona_organs.dm (#26004) 2024-06-29 18:38:51 +00:00
HMBGERDO 9ea58e1e33 Cult magic attacks and attacks on stun mark can now be blocked by shields (#25771) 
* cult attacks and hands blocked by shields

* logic fix attempt 1

* old shit

* Update code/game/gamemodes/cult/blood_magic.dm

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

* Update code/game/gamemodes/cult/cult_items.dm

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

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-29 18:28:26 +00:00
Mikhail Dzianishchyts c129ac3076 Edit max line length (#25071) 
* Edit max line length

* oh god

* ts also

* rebuild tgui

* Format again after conflicts resolving

* Me rebuild tgui

* this is minified

* this is removed

* rebuild tgui
 2024-06-29 18:17:26 +00:00
Lime-7 691314b5b0 Giving Pancuronium a recipe, now from different branch (#25936) 
* Giving Pancuronium a recipe, second attempt

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>

* Replaces sulfonal with bromine in recipe

its makes it easier to make and more logical, because its full name “Pancuronium Bromide” 

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>

---------

Signed-off-by: Lime-7 <142225267+Lime-7@users.noreply.github.com>
 2024-06-29 18:07:22 +00:00
Taurtura 1e1b711be5 More medkits ! With the correct branch this time! (#25985) 
* tactical medkit craft

* machine and aquatic kit from plastic

* adds fake tactical kit

* change recipe to make the fake tactical kit
 2024-06-29 17:59:35 +00:00
Contrabang bd8c428ee6 fuck why even fuck you (#25874) 2024-06-29 17:55:31 +00:00
PollardTheDragon c3f0694bad Drask Traitor Item - Cryoregenerative Enhancer (#25885) 
* Drask Traitor Item - Cryoregenerative Enhancer

* Removed extraneous list

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

* Better Math

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

* Excessive spacing

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

* Comment fix

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

* Cleaner dna logic

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

* Better lore

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

* Better readability on checks

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

* More noticable alert if empty.

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@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-06-29 17:54:39 +00:00