cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 18:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,497 Commits 26 Branches 2 Tags
ca93f6bc77c96af8a9868a30bf4cca919ecd25aa
Commit Graph

10889 Commits

Author SHA1 Message Date
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
Pedro
68635765b2 Adds a healthhud and securityhud to Captain's garment and crew monitor to Blueshield's locker. (#25982) 2024-06-29 18:00:25 +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
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
DGamerL
c12d0346a1 aaaaaa (#26080) 2024-06-29 01:59:20 +00:00
Luc
bfb9e8c132 Refactors Foam (#25436) 
* foam starts

* foam fixes

* foam foam foam

* remove widefoam, get cleaning grenades working as they should

* sirryan reeview

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

* Apply suggestions from code review

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

* locs good to me

* dgamer review

---------

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-06-28 20:39:26 +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
CRUNCH
bb2e96792b Tweaks the Light Replacer (#25932) 
* Light Replacer Enhancement

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

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

* Update

* Update lightreplacer.dm

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:16:37 +00:00
CRUNCH
62a7d79358 Update cigs.dm (#25842) 2024-06-28 03:16:32 +00:00
CRUNCH
ee6879ad7b Replaces the Nicotine in Rollies With Weed (#25840) 
* Update cigs.dm

* Update cigs.dm
 2024-06-28 03:15:33 +00:00
PollardTheDragon
48f429e307 Added smoketime calc to adding reagents (#25933) 
* Added smoketime calc to adding reagents

* Math fix

* Spacing

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

* Improved calculation

* SIMPLIFICATION MATH

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:08:46 +00:00
DGamerL
a3af356e55 New bag sprites by Alexios! (#25810) 
* New bag sprites!

* New biobag sprite
 2024-06-28 02:05:04 +00:00
HMBGERDO
5ccce78ba0 last tweaks (#26060) 2024-06-27 21:47:56 +00:00
chuga-git
da42a1c2f6 Refactors throwing (#25946) 
* refactors datum/thrownthing

* cleanup

* lewc review

* calling parent doesn't do anything lmao
 2024-06-26 21:03:51 +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
DGamerL
ed7782ad4c Adds the oneuse autosurgeon (#25978) 2024-06-26 20:38:53 +00:00
BiancaWilkson
a35abcdd29 begone typo (#26049) 2024-06-26 19:13:41 +00:00
Qwertytoforty
f6b8d87e78 Adds sscooters and skateboards [serious pr do not close after AFD] (#24934) 
* WORLD WIDE NOISE

* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding

* grind on pipes

* https://youtu.be/cTiM1MJ1o7c?feature=shared

* https://youtu.be/Jc6CHI9f6cM?feature=shared

* temporary change for icon conflicts (hopefully)

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* The rest of the fun loving owl

* missed this one

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

* changes

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

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

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

* I love stealth conflicts!

* purge lines

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

* Update tg_vehicles.dm

* works works works

* Update code/modules/vehicle/tg_vehicles/tg_vehicles.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>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-25 21:38:40 +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
Spaghetti-bit
457f9ff04f [TWEAK] Bio-Chip Pad Renaming Tracker Bio-Cips (#25617) 
* Allows the biochip pad to change the GPS tag on the tracker implant. No more standard 'TRACK0' on everything.

Updates the UI for the biochip pad.
Adds the biochip pad to the protolathe under the medical tab

* Prettier!!! :)

* Moves the "tag" property below the general blurbs.

* Update code/game/objects/items/weapons/bio_chips/bio_chip_pad.dm

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

* Merge Conflict Fix (1/2)

* MC (1.5/2)

* Merge Conflict Resolution (Hopefully)

---------

Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-06-25 21:29:45 +00:00
Faron
ef3162121a Fixes clones being stuck mindslaved (#25981) 
* Update clonepod.dm

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

* Update clonepod.dm

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

* Update bio_chip_traitor.dm

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

* Update datum_mindslave.dm

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

* Update datum_mindslave.dm

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

* Create misc_mindslave.dm

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

* Update paradise.dme

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-06-25 10:34:22 +00:00