cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,576 Commits 26 Branches 2 Tags
304e265e4584b2af0c835da150fd7fb9ec51bbfe
Commit Graph

10909 Commits

Author SHA1 Message Date
Adrer
304e265e45 Firefighter backpack once again generates metal foam (#26282) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-07-26 14:30:23 +00:00
CRUNCH
a8c9e14c9a Refactors the Attackby Proc of 40 Machines (Mostly Concerning the RPED) and RPED Afterattack (#26257) 
* Refactor wooo!

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-26 14:30:05 +00:00
AffectedArc07
f639e2cc1c Completely bans sleep from Initialize and LateInitialize (#25801) 
* GOD DAMN I WAS COOKING

* Makes portal less dumb
 2024-07-26 13:57:10 +00:00
Qwertytoforty
26f28cb7e7 A new space ruin, the telecommunications satellite? [100% done, ready for final review] (#25820) 
* THE WORK, IT GOES AND SO IT GOES

* darker yet darker

* more changes

* Almost done, let's post the pr and have some dev people test it out.

* update comment

* small change

* pushing , then we address changes

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

* more progress

* final bar lines

* aditional tweaks

* Update telecomns_returns.dmm

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* Apply suggestions from code review

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

* sirian changes

* emp weakness, light changes

* no runtimes, shoot borgs

* sorry for all the commits just update to master thanks

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* fixes

* fixes pathing. Voices

* removes always spawn

* Apply suggestions from code review

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

* more changes

* requested string change

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* lewcs final changes

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-25 18:26:14 +00:00
warriorstar-orion
98f0931c14 refactor: Allow using access helpers for airlock spawners. (#26141) 
* Allow access helpers for airlock spawners.

* whoops

* whitespace

* add visual access helper placement indicator
 2024-07-23 08:51:14 +00:00
DGamerL
a04ac32b09 Makes our codebase 1641 ready (#26151) 
* Makes our codebase 1641 ready

* Store variable

* Renames var
 2024-07-22 09:32:48 +00:00
dj-34
d51c3cf478 Fix inventory hands clickable areas & confusing overlay (#26212) 
* Remove confusing hand overlay

Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>

* Fix clickable areas of equipped items

Co-Authored-By: Serge K Lebedev <hello@sergelebe.dev>

---------

Co-authored-by: Serge K Lebedev <hello@sergelebe.dev>
 2024-07-22 07:43:05 +00:00
CRUNCH
b057000cf5 Fixes Some Minor Typos in Mineral & Glass Lore (#26235) 
* Kills you for a minor spelling mistake

* Update glass.dm
 2024-07-22 07:41:19 +00:00
Ryan
958d3ee32f fix (#26272) 2024-07-22 04:07:31 +00:00
BiancaWilkson
92a06960f7 [S] Unfucks it please oh god (#26269) 
* this should fix it

* this should fix it
 2024-07-21 02:28:16 +00:00
warriorstar-orion
102f6ffa5b refactor: remove 'blood track' varedits and splatter color (#26237) 
* refactor: remove 'blood track' varedits and splatter color

* script number

* Update code/game/objects/effects/decals/Cleanable/humans.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-20 16:29:17 +00:00
DGamerL
6c0163747c Makes NODROP mops not get stuck in mop buckets (#26250) 
* Cleans up the proc

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

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

* Faron review

* Proc refactor

* CI fixes

* Unnecessary check

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-20 16:27:53 +00:00
Luc
cb4d709c78 Fixes some extraneous spacing in some messages (#26222) 
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-20 00:15:21 +00:00
1080pCat
e32843e544 Fixes rigged batons runtiming on hit. and also fixes syringes (#26223) 2024-07-15 22:00:43 +00:00
warriorstar-orion
f861670748 refactor: move 'old sink' varedits to type' (#26236) 
* refactor: move 'old sink' varedits to type'

* script number
 2024-07-15 22:00:00 +00:00
DGamerL
e2e6dd50c3 Oops (#26204) 2024-07-11 03:33:15 +00:00
CRUNCH
e3d67c4f7d Miscellaneous Code Tidying (#26180) 
* Update items.dm

* Update welder.dm

* Update energy_melee_weapons.dm

* Update items.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-07-10 03:34:49 +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
Qwertytoforty
cd88b3de88 [s] Stunbaton no longer triggers shields twice (#26197) 
* [s] stunbaton no longer triggers shields twice

* renamed
 2024-07-09 15:08:16 +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
warriorstar-orion
ca93f6bc77 Retrofit TG pathfinder with upstream improvements (#25583) 
* Retrofit TG pathfinder with upstream improvements

* i know how things work

* don't use HAS_TRAIT for things that aren't traits

* unique filenames

* i'm just a goofy lil moron

* use new block syntax

* apparently values don't need clamping with new block syntax?

* silence invalid JPS dest runtime

* fix runtime passing ID instead of access list
 2024-07-08 15:48:43 +00:00
warriorstar-orion
62dc3d57dd cleanup: Remove all unused accesses. (#26146) 
* cleanup: Remove all unused accesses.

* Whoops, TCOMSAT is used, didn't read script correctly
 2024-07-08 13:12:46 +00:00
DGamerL
9a37b7104b Knuckledusters now change hitsound again (#26177) 2024-07-08 13:09:16 +00:00
DGamerL
e5915846fa Changes energy sword sharpening to use signals (#26157) 
* We love signals in this household

* This isn't needed

* Coconut review

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

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

* Adds handler

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-08 13:03:32 +00:00
DGamerL
09a4ed795c Various rollie fixes (#26163) 
* Various rollie fixes

* Fixes
 2024-07-08 12:54:20 +00:00
CRUNCH
46ca5d3133 Update glass.dm (#26184) 2024-07-08 12:51:04 +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
CRUNCH
7a3daae2b1 Update bio_chip_supercharge.dm (#26173) 2024-07-07 22:13:07 +00:00
1080pCat
4a7472495e Removes the 1s option from flashbangs (#26079) 
* flashbang 1s gone

* time defines

* Update code/game/objects/items/weapons/grenades/flashbang.dm

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

* Update code/game/objects/items/weapons/grenades/flashbang.dm

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-07-07 13:16:46 +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
Spaghetti-bit
8cfdc72b31 fix: Cleans up lighter code a tiny bit and fixes colored lighters becoming green (#26129) 
* Cleans up lighter code a tiny bit and fixes colored lighters becoming green.

* Applies a multitude of suggestions, cleans up code.

* Slims down the code and fixes the zippo.

* Axes `var/base_item_state`

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

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

* Applies suggestions from @DGamerL

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-07-05 16:59:16 +00:00
DGamerL
395804afbd You can cmag grenades to boomerang back to you (#25920) 
* Haha bomberang

* cmag act now

* Reverts inital commit

* Grenade instead of syndieminibomb

* Adds uncmagging
 2024-07-04 23:02:17 +00:00
tipoima
e58601b914 Fix wrong capitalization in mine's description (#26142) 2024-07-04 10:57:57 +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
DGamerL
1a3a77d42c Replaces the projectile deflect from the titanium push broom with a good parry (#26061) 
* No more reflect, good parry instead

* Remove this too
 2024-07-03 03:50:03 +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
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
Qwertytoforty
aaad036c7c Only small and tiny simplemobs can go on skateboards, shoot people off them [BALANCE PRE APPROVED] (#26091) 
* Only small and tiny simplemobs can go on skateboards, shoot people off them

* Update code/datums/components/riding/riding_vehicle.dm

Co-authored-by: Ryan <80364400+Sirryan2002@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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-02 00:14:09 +00:00
Luc
589650080e Fixes chemfoam reactions (#26097) 
* fixes chemfoam

* dgamer reviews
 2024-07-01 23:28:48 +00:00
CRUNCH
6f74ae32d3 Cleans up and Slightly Tweaks Health Analyser Code, Makes T-Ray \improper (#25788) 
* Update scanners.dm

* Update scanners.dm

* Update scanners.dm

* Update scanners.dm

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

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

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

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

* Update scanners.dm

* Update scanners.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>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@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 23:20:19 +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
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
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
1080pCat
24ceab2633 Spray paint no longer checks for eye protection, and rather if the eyes are covered or not. (#26001) 
* wowzers, who knew spraying wasn't a flash

* proc cleanup

* Update code/game/objects/items/crayons.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-07-01 18:55:21 +00:00
BiancaWilkson
29179cfb5e Fixes eyestabbing not dealing a correct amount of damage (#26095) 
* fixes 25161

* Update code/game/objects/items.dm

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

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-01 18:55:01 +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
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
1b56455861 Lowers grenade throwspeed (#25921) 2024-06-29 18:15:17 +00:00
DGamerL
b4bac5d681 Holoparasites are now discountable (#25943) 
* Discount the parasite!

* Fix testing values

* More testing values gone

* Carp scroll not discountable again
 2024-06-29 18:06:48 +00:00