Commit Graph

5795 Commits

Author SHA1 Message Date
BiancaWilkson 074da2b796 Datumizes microbatteries (#26900)
* Datumize microbattery

* comments + feedback when you're revivable

* More comment

* more datumization

* Explaining myself

* Being able to charge while not having a microbattery

* Better comment

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

* Changes proc name to be more accurate

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-10-18 23:30:04 +00:00
Chap c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881)
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-10-16 17:46:19 +00:00
Spaghetti-bit c1427a4565 Fixes a glowing eye issue and eye overlay issue (#26934)
* Reorders the layering, again. Fixes lighting issue with eyes.

* Update code/modules/mob/living/carbon/human/human_mob.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-10-15 12:47:22 +00:00
Chap a060093b59 [REFACTOR] Helper proc for unbuckling a mob (#26918)
* Helper proc from unbuckling a mob

* Rename to unbuckle

* Minor fixes

* Move buckled up /mob/living

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-10-10 12:54:09 +00:00
DGamerL 89796a055b Makes RemoveComponent more sane (#26877)
* Makes RemoveComponent more sane

* An even better wrapper

* Update code/datums/components/surgery_initiator.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-10-09 18:46:04 +00:00
Contrabang 4833fea9a2 IPCs dying to brain damage (#26957) 2024-10-06 17:52:29 +00:00
Silverplate 2d58d8e3ad lowers succumb threshold to 130 damage (#26941) 2024-10-02 15:17:06 +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 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
Contrabang 8fd62f8702 Protects living damage variables (#26892) 2024-09-25 11:09:56 +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
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
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
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
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
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
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
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
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
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 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
HMBGERDO 5234b6386b Revert attacked_by changes (#26330)
* t checkout master
Revert "Fixing fulton pack not working (#26153)"

This reverts commit 67353fd62a.

* Revert "Cult magic attacks and attacks on stun mark can now be blocked by shields (#25771)"

This reverts commit 9ea58e1e33.

* Revert "[s] Stunbaton no longer triggers shields twice (#26197)"

This reverts commit cd88b3de88.
2024-07-31 10:00:00 +00:00
DGamerL b497e4c925 Removes a lot of redefined procs (#26186)
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-30 13:19:32 +00:00
Ryan dfca6b833f Cloth Golems can no longer be infested by Legions (#26287)
* ClothGolemFix

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-07-29 16:42:53 +00:00
Faron 1e59b554dc Update human_update_icons.dm (#26305)
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
2024-07-29 15:07:15 +00:00
DGamerL 098b13bb33 Removes the empty type of /snacks (#26010)
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-07-29 14:46:04 +00:00
Qwertytoforty e4ed1b1db3 Radiation fixes. (#26113) 2024-07-25 17:15:12 +00:00
BiancaWilkson ec88636e6c Cyborg Damage, Movement, and Power Overhaul (#25252)
* Adding defines

* More signals for external power

* Gets the reboot working

* renaming a proc

* config stuff

* Working on cyborg movement

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

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

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

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

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

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

* IOSYS where'd you come from

* begon return 0

* VTEC caps slowdown

* Adjusting EMPs

* Funny arm is GONE

* Oh yeah regenerating stamina might be a good thing

* Forgot you could uninstall vtec

* icon machine broke

* Cell-less borgs can enter chargers to stay powered

* oh that was almost bad

* Fixes some logic

* its a surprise tool that will help us later

* Adjusting some numbers

* Adds a sound to go along with the text alarm

* dead things can still charge

* Another logic error

* Xenos too

* sorry linter

* fixes CL

* Slightly more slowdown on stam damage

* neurotoxin won't stun

* SOUNDS!

* 3 flashes to stun instead of 4

* Slightly longer stun

* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK

* Keep borgs stunned forever

* Power loss is more dangerous

* Adds a stamina hud to borgs

* Cyborgs now heal up properly

* Removes an outdated comment

* Replacing parts works better now

* EMPs disable components for a brief time

* More missed rebalances

* When you forget to remove debug messages

* WHAT

* Cult magic works + borgs can be silenced

* 2 flashes to stun, flashes confuse now

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

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

* Abductors can stun borgs

* Watcher/cyro rays deal stam to brog

* Fixes a rounding error when healing borgs back to full HP

* Fixed span

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

* Fixed whitespace

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

* Guard clausify

* Indents a message

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

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

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

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

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

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

* that's not what stat does

* No more hardcoded speed, don't TM this branch

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2024-07-09 17:44:50 +00:00
DGamerL 4cf6595d12 Makes all playsounds use bools for vary (#26183)
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
2024-07-08 23:54:38 +00:00
chuga-git c1e97f712c Minor throwing fixes (#26179)
* fix treadmill throwat

* fixes dropdel runtimes and end_throw() not being called

* dgl review
2024-07-08 21:07:18 +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
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
Spaghetti-bit fdcbfc42bb Fixes a very small oversight with blood DNA. (#26172) 2024-07-07 00:00:50 +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
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
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
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
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
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
Contrabang bd8c428ee6 fuck why even fuck you (#25874) 2024-06-29 17:55:31 +00:00
chuga-git 43b7fa5ed9 Gargantua Blood Rush now removes bolas (#25989)
* gargantua bloodrush now clears legcuffs, slightly refactors removing restraints

* comment tweaks, prevents blood rush from being used when buckled.

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

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-06-28 03:16:55 +00:00
datlo 882deeff51 Make magic disguises easier to break, reworks its spell cast (#25929)
* Make magic disguise easier to break

* add hitby

* add signal check

* update comment

* Fix check and update spell description

* Apply suggestions from code review

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

* added signal to atom

* Revert "added signal to atom"

This reverts commit 79e2aa68d8.

* Update code/datums/spells/disguise_self.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* adress review, add spin casting

* linter fix

* actually fix linters

* i am so dumb

* fix typo

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

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@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: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-06-28 03:16:39 +00:00
HMBGERDO 936d19c0a0 Blood spread fixes and tweaks (#26048)
* blood spread fixes and tweaks

* just to make sure

* soap cant be bloodied, better check on gloves
2024-06-26 20:57:30 +00:00
HMBGERDO d88ddea05c Touching bloody objects will make your hands/gloves bloody. (#25730)
* bloody blood

* no restrictions of item blood

* PR reviews

* comment
2024-06-25 21:31:00 +00:00