cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-14 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,649 Commits 27 Branches 2 Tags
f272b439ea91d40c66fcfcb9be9daebef610eb5f
Commit Graph

2879 Commits

Author SHA1 Message Date
Gatchapod
9863606763 entire messed up branch in one commit (#30794) 
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
 2025-10-31 22:56:33 +00:00
PollardTheDragon
a3b2c3a251 Refactors revenants to basic mobs (#30661) 2025-10-28 13:26:16 +00:00
Christer2222
4dc764a9cf lowers fence volume (#30814) 2025-10-28 10:55:41 +00:00
warriorstar-orion
601ff5601e allow for undershirts to be ckey-enabled (#30795) 2025-10-26 22:17:32 +00:00
CRUNCH
c1da0b30c7 Update tables_racks.dm (#30702) 2025-10-23 15:54:48 +00:00
PollardTheDragon
dc3f8f6cc9 Port goliaths to basic mobs, Round 2 (#30566) 
* Port goliaths to basic mobs.

* linting whitespace

* more linting

* wtf

* Addresses reviews on prior PR, adjusts behavior for food searching

* Missing Comma

* Goliath aggro range

* Reduces goliath speed to 5 from 3

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-21 19:27:27 +00:00
CRUNCH
5cb7eec5ad Adds Cult Chairs (#30587) 
* V2 Ultrakill

* Update chairs.dm

* Update sheet_types.dm

* Update chairs.dmi

* Update chairs.dm
 2025-10-19 19:06:44 +00:00
CRUNCH
4784679311 Adds Cult Tables (#30561) 
* cult

* Update sheet_types.dm

* pylon
 2025-10-07 17:52:47 +00:00
CRUNCH
3a201061f2 shelf (#30548) 2025-10-07 17:44:00 +00:00
kyunkyunkyun
9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453) 
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
 2025-10-06 17:59:46 +00:00
DetectiveEnotsky
7e8b6322d7 Fixes showers hiding behind posters (#30538) 
* modified: code/game/objects/structures/watercloset.dm
changed north facing showers layer to 4, so they don't hide behind posters anymore.

* A smarter thing by @warriorstar-orion

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

---------

Signed-off-by: DetectiveEnotsky <87281888+DetectiveEnotsky@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-03 01:22:59 +00:00
PollardTheDragon
0a829ba143 Nukes Xeno Revive Nest (#29376) 
* Nukes Xeno Revive Nest

* Nukes Xeno Revive Nest

* Config changes are bad. Whoops

* Laying down on xeno weeds now cures viruses at the same rate as revival nests used to

* Adds owner virus check
 2025-10-01 15:21:48 +00:00
PollardTheDragon
e14a43eea1 Basic diona nymphs, spiderbots, and crabs (#30377) 
* Basic nymphs, spiderbots, and crabs

* Nutrition fix

* Forgot a line

* Cooldown on eat

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-10-01 14:32:00 +00:00
kyunkyunkyun
caa8343bf7 Repath some satchels (#30427) 
* fix satchel interactions

* updatepaths name
 2025-09-27 08:46:36 +00:00
warriorstar-orion
568a6681b7 fix melee attacks not working with tendrils (#30454) 2025-09-24 17:57:55 +00:00
PopeDaveThe3th
60f5a240a4 disgustin (#30272) 2025-09-24 12:55:42 +00:00
warriorstar-orion
df0e69332f fix paper wrapping crates (#30482) 
* fix paper wrapping crates

* define magic number
 2025-09-19 16:05:48 +00:00
PollardTheDragon
b52f6cc6c0 Converts farm animals to basic mobs (#30244) 
* Converts farm animals to basic mobs

* Update paths, removes excess file

* CI

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-19 15:26:43 +00:00
Ahzpy
bd911799b8 Librarian Drip Expansion (#30167) 
* all the sprites in the wrong place

* suits are now in the suit files

* code and whatnot

* oops all config

* hand holes, locker, garment bag, loadout

* adds locker to every station

* some fixes

* pleases review overlords

* fixes errors?
 2025-09-16 18:59:32 +00:00
warriorstar-orion
3208049a8a Attack chain migration: structures. (#30365) 
* Attack chain migration: structures.

* whoops

* wth
 2025-09-14 19:21:36 +00:00
kyunkyunkyun
8821ab9a66 Updates a couple of /obj/item variables (#29829) 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
 2025-09-14 15:23:56 +00:00
kyunkyunkyun
6862135913 Ports some old TG lighting + opacity refactors (#29724) 
* lighting ports

* missed these

* fix

* tweak optical scanners

* Update code/datums/elements/light_blocking.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-09-08 19:25:37 +00:00
kyunkyunkyun
10f2e67e65 Cleanups and tweaks observer code (#30250) 
* observer cleanup

* this

* bit more

* Update tgui.bundle.js
 2025-09-05 05:54:22 +00:00
Contrabang
19e1785eed Adds a macro for 0 wait timers as END_OF_TICK (#30309) 
* Adds a macro for 0 wait timers as END_OF_TICK

* comment update
 2025-09-04 07:09:08 +00:00
warriorstar-orion
7022365e53 add CI check for exploitable recycle costs (#30286) 2025-09-04 07:00:12 +00:00
Ahzpy
bba55ba75f Nanocratesen: Corporate Crates (#30190) 
* sprites and obj

* Update pack_miscellaneous.dm

* sprite fix

* replaces vault crates
 2025-09-01 04:30:09 +00:00
Contrabang
01ebc0245b Transit tubes are now dense when they have gravity (#30073) 2025-08-29 16:42:53 +00:00
kyunkyunkyun
f6e682a6d7 armor defines (#30115) 2025-08-28 14:58:07 +00:00
CRUNCH
8ea1c3b08e Migrates obj/item/inflatable and obj/structure/inflatable to the new attack chain. (#30253) 
* creation

* Update inflatable.dm
 2025-08-28 14:56:29 +00:00
Osetrokarasek
a9a8fd6233 muvgth (#30139) 2025-08-26 01:51:47 +00:00
PollardTheDragon
c6e164a643 Basic gutlunch and goldgrub (#30032) 
* Goldgrubs

* Gutlunches, breeding code, goldgrub fixes

* Lints

* Extra define

* Config screwup

* Linters again

* Oops

* Gets rid of extra kangaroo

* Formatting and grammar

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-08-25 17:52:42 +00:00
PollardTheDragon
9044084b95 Gives all Heads of Staff energy pistols, equips with cybernetics (#29848) 
* Gives all heads of staff epistols, starts with basic implants

* Whoops

* Replaces roundstart head of staff implants with them being in single-use autosurgeons

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-24 15:12:55 +00:00
CRUNCH
ba68ebe85c creation (#30220) 2025-08-23 18:02:26 +00:00
Silverplate
bf750135d0 CSI Eridani: Detective content update (#27512) 
* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Mapping changes

* Mapping changes

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* makes linters work

* i hate vscode

* fixes some nonsence

* may fix CI

* restore maps to CURRENT

* QOL

* makes gunshot residue actually work.

* fixes cursed logic

* adds scene cards again

* scene cards but real!

* fix med records, breaks attack chain

* Revives the PR

* fixes swabs

* TGUI update

* lewc and dgl first reviews

* dna medical records

* LINTERS FIX

* linter fix 2

* blood fix and linters again

* oops

* updated but broke

* help

* Chuga suggestion

* Fix shoes ending up with a null blood_DNA entry

* replace astype() because linters are still in the stone age

* 2 fixes, adds fingerprint cards to HOP locker.

* check user intent instead of target intent when swabbing

* adds 2 boxes of swabs to the det drobe

* comma important

* adds new det tools to sec belt

* Chuga review

* fuckin github

* should fix TM

* oops

* how about now

* also fixes cere

* fixes mobvars

* Update code/modules/detective_work/swabs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Update code/game/objects/effects/decals/cleanable.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Lewc review easy changes

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Updated related bugfixes

* add swab to lathe

* fix metastation

* Fixes scene_cards

* fix cerestation

* fixes forensic kits

* Changes and fixes forensic_machines

* changes /obj/item/sample to use initialize

* spaces

* fix initialize to use a capital I

* mapload

* fixes linters probably

* meta fix

* swab fix maybe

* oops

* actual fix probably

* ma ybe

* bundle rebuild

* fixes fingerprint cards

* remove duplicate proc call

* /obj/item/sample migration

* /obj/item/forensics migration

* microscope and dnaforensics machines migrated

* I FORGOT DA VARS

* linter fix

* linter fix 2

* Funny review part 1

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* bundle update

* contra/funny review

* fixes CI probably

* CI fix

* cere mapping fix yipee

* screwdriver panel fixes

* improve forensic machine interactions

* improve open panel msg

* pollard review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* linter fix

* Apply suggestions from pope review

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* rebuild

* rebuild

* Detective Rework

---------

Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-08-23 15:27:38 +00:00
Contrabang
9b735ec3fe Migrates /obj/item/chair to the new attack chain (#30169) 
* Moves chair to the attack chain

* comment fix
 2025-08-22 15:10:54 +00:00
Contrabang
b2e6789f5a Migrates bedsheets, bedsheet bins, beachballs, baseballs, basketballs, and banhammers to the new attack chain (#30170) 
* bedsheet

* click tweak
 2025-08-22 14:30:29 +00:00
PollardTheDragon
e43a88de5b Converts Nian Caterpillars to Basic Mob AI (#29938) 
* Nian Caterpillar Basic Mob

* Merge conflict resolution

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-19 13:40:31 +00:00
Contrabang
012a00aafb Refactors large crates. Adds sound and makes them not-instant. (#30068) 
* bonk

* refactors large crates
 2025-08-19 13:23:16 +00:00
Burzah
ed35e46fb1 acidproof (#30044) 2025-08-19 00:28:36 +00:00
Ahzpy
c1ce48e413 The Big Botany BResprite: Movement II, The Clothening (#29902) 
* code and icons

* file renaming

* vendor prices, apron/overalls obj icons, species sprites

* species head sprites because thats a thing

* loadout inconsistencies fix

* vox have their own apron and overalls sprites so i added those. oh the lengths i go for you botany

* loadout 2: return of the inconsistencies

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* maybe fixes merge conflict?

* merge conflicts are so annoying holy shit

* sick of this dme junk

* remove unrelated change

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* merge conflict test fix

* super merge conflict fix

* fix drask syndiberet

* actually fixes drask syndiberet

* super ultra final beret fix

* Update loadout_uniform.dm

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
 2025-08-13 22:30:07 +00:00
Aleksandr Sakrukin
ace1fa8c24 Allow the cyborgs to place objects on tables and in closets using the gripper (#29893) 
* Add exception if item is in gripper

* Add transformation from list to params, for corret work of melee_attack_chain function
 2025-08-10 14:55:35 +00:00
CRUNCH
370e9f331d Updates the Description of the Grille (#29951) 
* Update grille.dm

* Update grille.dm
 2025-08-10 14:32:24 +00:00
Osetrokarasek
3b085824c0 Adds mesons into explorers' lockers (#29808) 
* fdnshgnd

* bikogjfnbhg

deleted icon_state string for mining wardrobe closet as its done in #29894

---------

Signed-off-by: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
 2025-08-07 16:33:05 +00:00
Kyani
d39c12ce5c defile rework (#29926) 2025-08-06 05:57:14 +00:00
PollardTheDragon
1054b263bb Converts Watchers and Legions to basic mob AI (#29884) 
* Converts basilisks, watchers

* Hivelords and legions

* Hivelordbrood balance adjustment

* New Linters

* Speech fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-06 05:54:06 +00:00
PollardTheDragon
3b0a9c4381 Converts a whole lot of friendly mobs to basic mob AI (#29815) 
* Butterflies, Cockroaches, Slothes, Snakes, Penguins, and Bunny Basic Mobs

* Lizards too

* Oops

* Lizard emote keybind

* Updatepaths

* Apply suggestions from code review

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

* Moved lizard emote to basic_emotes.dm, simplified hide action

* New linters

* Merge conflict resolution

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-08-06 01:17:13 +00:00
YoursTrulyHollow
072bebd088 Drip expansion: Syndicate garment bag (#29764) 
* repair droid sprite update

* biochips

* syndie drip 1

* Update code/game/objects/items/weapons/storage/garment.dm

Indeed, my apologies

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/glasses/glasses.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/glasses/glasses.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/head/beret.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* Update code/modules/clothing/neck/cloaks.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>

* merge conflict resolve attempt 1

* Merge conflict resolve attempt 2

* mergre conflict RESOLUTION attempt 3

* Revert "mergre conflict RESOLUTION attempt 3"

This reverts commit 06e0f77564.

* Merge conflict resolution attempt 4: hooks edition

* maybe i shouldn't have commented that one thing out

* updated garment bag description, removed stashed change

* removed garment bag contents stashed changes

* removed syndie beret stashed changes

* removed syndie cloak stashed changes

* fixing my fuckup part 1

* fixing my shit part 2

* fixing my shit part 3

* fixing my shit part 4

---------

Signed-off-by: YoursTrulyHollow <100510026+Hollow1364781653786@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-08-02 05:27:06 +00:00
Charlie Nolan
435637e257 All Secondary Goals use labels (#29776) 
* All Secondary Goals use labels

* Fixes.

* Fixes.

* Update code/__DEFINES/dcs/basetype_signals.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-07-31 06:01:26 +00:00
PollardTheDragon
b4790e057e Converts gorillas to basic mobs (#29783) 
* Converts gorillas to basic mobs

* Accidentally pushed a config change. Whoops

* Updatepaths

* Removes unique_mob var

* New linters
 2025-07-31 05:49:48 +00:00
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00