cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-18 02:21:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,362 Commits 12 Branches 2 Tags
2bbbc148ed491fbc705eeb1e4ac084ff2324bc7d
Commit Graph

47125 Commits

Author SHA1 Message Date
PollardTheDragon
89e8381f0d Updates False Alarm Event (#31845) 
* Updates False Alarm Event

* Whoops
 2026-04-11 22:13:09 +00:00
CRUNCH
24882613de Migrates Cards, Card Hands, and Card Packs to the New Attack Chain (#31805) 
* Update cards.dm

* Update code/modules/games/cards.dm

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Miles <116982774+Burzah@users.noreply.github.com>
 2026-04-11 22:11:03 +00:00
CRUNCH
8f842a2353 Adds Rations for the TSF, USSP, and ERTs (#31795) 
* Creation

* revival AGAIN

* Update ration_pack.dm

* It returns yet again for the final time maybe

* e

* linter

* Update ration_pack.dm

* Update ration_pack.dm

* Update test_tiny.dmm

* Update bluespace_tap_spawners.dm

* Apply suggestions from code review

Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update rations.dm

* Update rations.dmi

* Update storage.dmi

* Update code/modules/food_and_drinks/food/foods/rations.dm

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

* Polish icons in rations.dmi

* Update ration storage icons.

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Co-authored-by: Fordoxia <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Alfalfa Scout <alfalfascout@proton.me>
 2026-04-11 04:59:54 +00:00
PollardTheDragon
f8f59b9353 Fixes brand intelligence (#31821) 2026-04-10 23:43:46 +00:00
PollardTheDragon
fc6b96fae4 Fixes exploit with doors (#31863) 2026-04-10 22:42:40 +00:00
PollardTheDragon
62392cb2a8 Fixes infinite soap mouth (#31835) 2026-04-10 00:20:52 +00:00
PollardTheDragon
32f4875741 Fixes terror spiders nullspacing (#31834) 2026-04-10 00:20:06 +00:00
PollardTheDragon
a81b850f6b QOL: Nkarrdem Light Replacer (#31792) 2026-04-09 23:15:16 +00:00
PollardTheDragon
e5a841c2c0 Adds Light Replacer QOL for AI Programs (#31791) 2026-04-09 23:14:27 +00:00
PollardTheDragon
b2e62b80fe Updates Sentience Event (#31843) 2026-04-09 23:04:43 +00:00
PollardTheDragon
f2fa355ec0 Nerfs Spacecrawl (#31825) 
* Nerfs Spacecrawl

* Update code/modules/antagonists/heretic/magic/space_crawl.dm

Co-authored-by: iramoye <projecteternal1@gmail.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: iramoye <projecteternal1@gmail.com>
 2026-04-09 22:37:55 +00:00
PollardTheDragon
1d2566429c Nerfs Kingstons (#31809) 
* Nerfs Kingstons

* Update kingstons.dm
 2026-04-09 20:53:39 +00:00
PollardTheDragon
8aeceae7dc Fixes basic mobs being lit ablaze invisibly (#31801) 
* Fixes basic mobs being lit ablaze invisibly

* Snowflakes
 2026-04-09 20:52:29 +00:00
PollardTheDragon
cff45b319f Fixes ash men burning themselves (#31800) 2026-04-09 20:51:39 +00:00
PollardTheDragon
21ca0a88f4 QOL: Airlock Opening on Turf Click (#31790) 
* QOL: Airlock Opening on Turf Click

* the fix

* Adjust silicons to shift-click

---------

Co-authored-by: Fordoxia <Thrash97@googlemail.com>
 2026-04-09 20:49:05 +00:00
PollardTheDragon
bb4668ed99 Nerfs Hecksuit/Drake Armor off Lavaland (#31782) 2026-04-09 20:47:32 +00:00
PollardTheDragon
849e33e147 Adds dueling pistols (#31772) 
* Adds dueling pistols

* Bonus damage for dueling

* Oops

* Sprite stuff

* Sprites and fixes
 2026-04-09 20:45:31 +00:00
The Malf E
1e77473c7b super death red alert noise (#31808) 2026-04-09 19:28:57 +00:00
Hayden Redacted
bdcbd1aa03 Adds the MODsuit Health Analyzer (#31813) 
* initial commit

* makes it printable at robotics

* Update code/modules/mod/modules/modules_medical.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* we already had a sprite

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2026-04-09 19:21:02 +00:00
CRUNCH
82e30b6f61 Update cable_coil.dm (#31827) 2026-04-09 04:37:38 +00:00
Alan
ab0e348318 Add nothingburgers for real. (#31823) 
* Add nothingburgers.

* Remove duplicate var. Thanks, linters!
 2026-04-09 04:36:47 +00:00
Hayden Redacted
60a746145d initial commit (#31814) 2026-04-09 04:35:18 +00:00
Kar4es
f987ba0e3f fix (#31788) 2026-04-09 04:32:05 +00:00
Alan
ba5db365e3 Adjust earwear for monitor heads. (#31775) 
* Adjust earwear for monitor heads.

* Tweak soviet headset, correct icon code.
 2026-04-09 04:21:23 +00:00
CRUNCH
05eeff6df2 Fixes a Bunch of RCL Bugs (#31698) 
* RCL cable migration

* e

* Pain and death

* merge master fixes

* e

* aaaaaa

* Update RCL.dm

* AaaaAAAAA

* Update cable_coil.dm

* Update cable_coil.dm

* returns throwforce

* removes color feature

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-04-09 02:50:24 +00:00
PollardTheDragon
c6620a0c96 Adds Cargo Drop Pod Collision Moderate Event (#31771) 
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2026-04-07 14:39:31 +00:00
CRUNCH
48ffe9dd63 Update stack.dm (#31850) 2026-04-07 03:41:35 +00:00
Alan
79808d261e Resprite generic drink overlay. (#31781) 2026-04-05 05:17:04 +00:00
Alan
e9fcd1b035 Adjust masks to fit monitor heads. (#31773) 
* Adjust masks to fit monitor heads.

* Remove duplicate var. Thanks, linters!

* Tweak west-facing lucha masks.
 2026-04-05 05:16:32 +00:00
Alan
c53bc3fd2d [s] Fix grinder detach. (#31836) 2026-04-04 18:11:06 +00:00
PollardTheDragon
01726c44b5 Adds logging for if a grenade is primed by damage received (#31761) 2026-04-03 20:24:31 +00:00
Hayden Redacted
1b798b2155 Adds Paradise Trading Cards! (#31756) 
* Initial commit

* oops no warns allowed

* linters along with descriptions, psych, forklift, and brad cards

* i can read errors, trust

* yes

* more linter

* remove extra declaration

* identical var fix

* Pollard suggestions

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* removes some comments and renames some TCG branded things

* CRUNCH's attack chain migration

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* various icon and adds packs to maintenance loot

* moved some coin stuff around and linters

* Coin icon fix and adds them to the NT merch vendor

* linter fix

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-04-02 20:00:37 +00:00
serapher
bf974ec3ab Adds New Medical Berets (#31683) 
* Resprites current doctor beret and adds new ones

* Updates species' beret.dmi

* Updates species' beret.dmi, again

* Fixes a misnamed beret, adds obj sprites

* Makes the new berets accessible in-game

* Updates a map file to use the correct beret name

* Add desc to psych berets + small tweaks to code

* Lets other med roles use the MD beret

* Fixes species sprites

* Remove an additional blank line

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com>

---------

Signed-off-by: serapher <126386932+Uno657@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2026-04-02 04:46:03 +00:00
Alan
a7971e4af9 Add sand sculptures. (#31760) 
* Add sand sculptures.

* Apply suggestions from review.
 2026-04-02 02:37:19 +00:00
Hayden Redacted
9e0b03bd3c initial commit (#31769) 2026-04-02 02:35:06 +00:00
martcraft
a50560d238 Added sounds, correct attribution and working code to give EN sounds of it's own. (#31770) 2026-04-02 02:34:33 +00:00
CRUNCH
d030b8afb8 Migrates /obj/item/stack to the new attack chain (#31709) 
* e

* stuff not in the stack folder

* A

* Update gift_wrappaper.dm

* golg

* dancing around SHOULD_NOT_SLEEP and storage still being legacy

* Update asteroid_floors.dm

* Update medical_packs.dm

* Update medical_packs.dm
 2026-04-02 02:32:15 +00:00
PollardTheDragon
07b4ab0b4c Fixes Floor Cluwne Oversight (#31810) 
* Fixes Floor Cluwne Oversight

* Cluwne oversight
 2026-03-31 01:29:32 +00:00
PollardTheDragon
da2d5cbb8f Fixed swarmers spawning in spaced areas (#31797) 2026-03-30 13:34:32 +00:00
PollardTheDragon
a3e015b921 Fixes tape breaking bluespace light replacer icons (#31799) 2026-03-30 13:33:40 +00:00
Alan
082cc586b3 [s] Fix suture stacks. (#31787) 
* Fix suture stackification.

* Apply suggestion from review.

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

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2026-03-29 06:40:00 +00:00
PollardTheDragon
70b2174fe4 Fixes dropping ninja net gun when stunning (#31783) 2026-03-29 02:23:26 +00:00
PollardTheDragon
524de1b822 Fixes delta alert state (#31774) 2026-03-29 02:21:16 +00:00
PollardTheDragon
87c2a19ecd Adds Mafia Boss Syndicate Kit (#31701) 
* Adds mafia boss syndicate kit

* Comment update

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Miles <116982774+Burzah@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: Miles <116982774+Burzah@users.noreply.github.com>
 2026-03-29 02:17:15 +00:00
PollardTheDragon
8c61696a64 Re-adds floor cluwne midround (#31644) 
* Re-adds floor cluwne midround

* Increased round requirements

* Significantly reduces floor cluwne event weight

* Woe, old code upon me. Fixed.

Co-authored-by: Miles <116982774+Burzah@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: Miles <116982774+Burzah@users.noreply.github.com>
 2026-03-29 02:16:50 +00:00
PollardTheDragon
99b5d925ee Adds cmag as maints loot (#31697) 2026-03-29 02:04:22 +00:00
Alan
cca2ab2338 Add new wetsuits. (#31752) 2026-03-26 03:38:53 +00:00
1080pCat
3500b21a91 biggest botany nerf 2026 (#31749) 2026-03-26 02:44:22 +00:00
iramoye
b8334feaaa adds protein to chicken balls (#31747) 2026-03-26 02:43:54 +00:00
Alan
78cd35a1f8 Refit swimsuits for all species. (#31751) 
* Refit swimsuits for all species.

* Tweak swimsuit shape around Drask hips.
 2026-03-26 02:43:06 +00:00