cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-22 04:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
59,494 Commits 15 Branches 2 Tags
e5915846fafd591b917f47dca6a58324bf3815e3
Commit Graph

44069 Commits

Author SHA1 Message Date
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
CRUNCH 13af419214 Fixes Some Minor Grammar Errors That Most People Will Never See (#26138) 
* Update mind.dm

* Update code/datums/mind.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
 2024-07-08 13:01:11 +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 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
Spaghetti-bit edc6695e54 Checks for emagged on firealarms to properly disable them from activating unless pulled manually. (#26170) 2024-07-07 22:46:30 +00:00
Aylong d118388ad8 Fix: Active mousetrap inhand sprite (#26176) 2024-07-07 22:45:56 +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
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
Spaghetti-bit 421d7d8286 Emotes now vary in frequency when they are not age based. (#26171) 2024-07-07 13:06:24 +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
HMBGERDO 8e57d9a40b 10TC!!! (#26076) 2024-07-06 08:33:40 +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 97eb823d4e Update mecha_actions.dm (#26126) 2024-07-05 18:00:30 +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 9570f5eebd [FIX] RPED can now put beakers into machine frames (#26121) 
* Replica syndicate space suit sprites

* Revert "Replica syndicate space suit sprites"

This reverts commit 1fb5cf68ac.

* RPED can now put beakers into machine frames as well

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-07-05 17:57:11 +00:00
Qwertytoforty 97d4525ce7 new dropwall sprites from TG, fix dropwall timer (#26063) 
* new dropwall sprites from TG, fix dropwall timer

* improves icon further
 2024-07-05 17:01: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
warriorstar-orion 8da5beb34b fix: strip '\improper' from request console names (#26123) 2024-07-05 15:02:12 +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
Spaghetti-bit 06a52c5eac Shoving someone into a vendor now informs people around them. (#26108) 
* Fixes https://github.com/ParadiseSS13/Paradise/issues/26072

* Apply suggestions from code review

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

* Applies suggestions.

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-03 12:49:59 +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
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
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
Spaghetti-bit 6de5e76549 Fixes an indexing issue with layers, making shoes now be removable again... (#26125) 2024-07-03 02:10:14 +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
Qwertytoforty b7049b9223 moves the bullet act outside (#26109) 2024-07-02 00:35:33 +00:00
tipoima d7ef7012a8 Lets the players know that they can steal just the photo of the blueprints instead of the entire thing. (#26086) 
* Lets the players know that they can steal just the photo of the blueprints instead of the entire thing.

* implements Contrabang's request

* Update code/game/gamemodes/steal_items.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-07-02 00:19:34 +00:00
BiancaWilkson 47324d867f You can cancel out of pandemic printing now (#26107) 2024-07-02 00:17:32 +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
Aylong bf59a0c4f0 Remove a duplicate TGUI input toggle (#26096) 2024-07-02 00:08:42 +00:00
Adrer b3f5e2a0aa Hostile machines from machine override no longer attack the AI and borgs. (#26046) 
* Replica syndicate space suit sprites

* Revert "Replica syndicate space suit sprites"

This reverts commit 1fb5cf68ac.

* Machine override machines no longer attack the AI

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-07-02 00:08:21 +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
Adrer 2db46f67a2 Body scanner displays default value when no broken_description (#26106) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-07-01 23:51:26 +00:00
Luc a5c13f066e adds a copy button to fill mode (#25997) 2024-07-01 23:29:28 +00:00