cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,806 Commits 14 Branches 2 Tags
master
Commit Graph
11926 Commits
Author SHA1 Message Date
AhzpyandGitHub 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
CRUNCHandGitHub 763bd32861 The Smoking Expansion DLC II - The Second Puff (#30334) 
* King's Own Tobacco

* Update cigs.dm

* cigar boxes

* badass

* CI

* CI (again)

* Update centcomm.dmm
 2025-09-15 12:39:13 +00:00
1080pCatandGitHub 4ffa9870cd Migrates the baseball bat to the new attack chain, and makes it use tg cooldowns (#30387) 
* migrates the baseball bat to the new attack chain, and makes it use tg cooldowns

* meant to revert that

* moves a var

* Update weaponry.dm
 2025-09-14 19:52:30 +00:00
warriorstar-orionandGitHub 3208049a8a Attack chain migration: structures. (#30365) 
* Attack chain migration: structures.

* whoops

* wth
 2025-09-14 19:21:36 +00:00
kyunkyunkyunandGitHub 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
OsetrokarasekandGitHub 641d05863c ddd (#30339) 2025-09-11 03:17:48 +00:00
PollardTheDragonGitHubLuc
 		0f438326b6 Converts Viscerators and Malfunctioning Combat Drones to Basic Mobs (#30080) 
* Initial Commit

* Targetting

* Linters

* Update code/modules/mob/living/basic/retaliate/combat_drone.dm

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

* CI fix

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-09-11 02:34:37 +00:00
ContrabangGitHubBurzah
 		e8f67c5e81 Makes Genetics fully a sci department (#30017) 
* genetics -> sci

* Update code/game/jobs/job/science_jobs.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-09-09 18:20:39 +00:00
PollardTheDragonGitHubContrabangAmityBlamity
 		fca03efeb0 Exfiltration - Early Antag Escape (#29554) 
* Ghost bar antag addition

* Adds extraction flares and extraction procs

* Ghostbarification, antag-specific extractions

* Objectives reroll if target extracts

* Comment format

* Adds blackboxing. Prevents extraction if you're an objective target.

* Fixed objective freezing, removes mindslaves on exfiltration

* Vampire Portal Sprites

* Better sprite for portal

* Flayer telepad, assorted visual adjustments

* Makes flayer and vampire portals truly one time use. Flayer ability icon

* Fixed indents, vampire ability icon

* Changeling flare

* Removed some debug adjustments

* Map fixes

* Makes the exfil restriction a var on the datum

* More map fixes

* Centcomm my beloathed

* More map fixes

* Checks delay before objectives

* Objective freezing list fix

* Review fixes

* Moves a lot of exfil item granting logic to antag datum.

* Changed objective exfil block from var to proc

* Centcommmm

* Adds true return. Thanks Contra.

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

* Efficiency

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

* Moved jaunter subtypes

* Forgot to move the admin one

* Capitalization

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

* Reworked area selection

* Black box, admin log, proper clearing of martial arts and bio chips

* Exfiltration now properly checks completion of alive and free escape objective

* Adds announcement to security comms when exfil item is used

* Linters

* Map adjustments

* Fixes syndiebar library computer access

* Merge conflict resolution

* Updates action buttons

* New Linters

* Update centcomm.dmm

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com>
 2025-09-09 01:28:09 +00:00
kyunkyunkyunGitHubContrabangBurzah
 		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
kyunkyunkyunandGitHub 11962e1b94 Fix armor penetration increasing negative object's and mob silicon's armor (#30105) 
* fix

* no src allowed
 2025-09-07 11:34:29 +00:00
kyunkyunkyunandGitHub 10f2e67e65 Cleanups and tweaks observer code (#30250) 
* observer cleanup

* this

* bit more

* Update tgui.bundle.js
 2025-09-05 05:54:22 +00:00
ContrabangandGitHub 5b368c3f8f Renames some pre_attack arguments (#30324) 
* Renames some pre_attack arguments

* fix
 2025-09-04 07:11:59 +00:00
ContrabangGitHubPopeDaveThe3th
 		7bdc36a032 Adds the syndicate equivalent of a mindshield, and other syndicate officer adjustments (#30311) 
* Adds the syndicate equivalent of a mindshield

* ci yay

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

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

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

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

* suspicion

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-09-04 07:09:56 +00:00
ContrabangandGitHub 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-orionandGitHub 7022365e53 add CI check for exploitable recycle costs (#30286) 2025-09-04 07:00:12 +00:00
ContrabangandGitHub 7125897ebb Refactors Mousepointers + Code improvements (#29960) 
* blah

* tweaks

* refactor

* awesome

* put everything in mouse_icons folder

* make spells work

* update twin

* tweak

* woop woop

* remove dynamic mousepointers

* bam
 2025-09-02 20:47:56 +00:00
warriorstar-orionGitHubBurzah
 		7162b71b4a Refactor ID console. (#29927) 
* Refactor ID console.

* TGUI Bundle Rebuild

* Update code/game/machinery/computer/id_card_console.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/id_card_console.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/machinery/computer/id_card_console.dm

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-09-02 20:46:18 +00:00
kyunkyunkyunandGitHub ca8e5a6a7d nerf that water (#30209) 2025-09-02 05:53:52 +00:00
ContrabangandGitHub e1f42f4673 pre_attack change (#30305) 2025-09-01 21:10:58 +00:00
AhzpyandGitHub 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
kyunkyunkyunGitHubPollardTheDragon
 		626eaaeb79 Removes british spelling of armor from armor_penetration vars (#30104) 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

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

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-01 04:27:52 +00:00
ContrabangandGitHub 01ebc0245b Transit tubes are now dense when they have gravity (#30073) 2025-08-29 16:42:53 +00:00
OsetrokarasekandGitHub 90af6975e6 Fixing knifes material amount (#30323) 2025-08-29 15:19:17 +00:00
ContrabangandGitHub b4724b63fa More Suture Changes (#30164) 
* more suture changes

* grammar
 2025-08-28 23:10:32 +00:00
ChapGitHubadrermail@gmail.com <adrermail@gmail.com>
 		8b8181e18a Upgrade ERT oxygen tanks to doubles. (#30208) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-28 20:54:42 +00:00
ChapGitHubadrermail@gmail.com <adrermail@gmail.com>
 		3507562a81 [FIX] People lying on the ground can no longer be snared by a bola (#30180) 
* People lying on the ground can no longer be hit by a bola.

* Use the IS_HORIZONTAL macro instead

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2025-08-28 16:12:32 +00:00
kyunkyunkyunandGitHub f6e682a6d7 armor defines (#30115) 2025-08-28 14:58:07 +00:00
CRUNCHandGitHub 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
PollardTheDragonandGitHub a3d9ecf4c9 Fixes gutlunch controllers (#30277) 2025-08-28 14:48:38 +00:00
OsetrokarasekandGitHub a9a8fd6233 muvgth (#30139) 2025-08-26 01:51:47 +00:00
OsetrokarasekandGitHub 97047c3bb9 Emptying Lathed Welding Tools And Extinguishers (#30137) 
* asfgdsa

* cnrbangn rqerqest chaengs...
 2025-08-26 01:49:10 +00:00
SchrodingersWolfandGitHub 00cbe5f9c4 Splints are now appliable to chest, lower body, hands and legs (#30124) 2025-08-26 01:47:43 +00:00
CRUNCHGitHub1080pCatPollardTheDragon
 		be2f874e76 Removes crap, upgraded, and upgaded+ cells. Buffs the capacity of basic cells. (#29958) 
* Purgation complete

* Update cell.dm

* duplicated descriptions

* subtyping

* Update cell.dm

* Loot

* Update misc_spawners.dm

* Update misc_spawners.dm

* Update code/game/objects/effects/spawners/random/misc_spawners.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cell.dm

* Update code/game/objects/effects/spawners/random/misc_spawners.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/modules/power/cell.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-26 01:38:33 +00:00
PollardTheDragonGitHubwarriorstar-orion
 		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
PollardTheDragonandGitHub 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
PopeDaveThe3thandGitHub 42d07892c9 Resprites Bullets (#30011) 
* boolet

* when the lint is er

* almost

* there we are

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-08-24 03:31:43 +00:00
CRUNCHandGitHub ba68ebe85c creation (#30220) 2025-08-23 18:02:26 +00:00
SilverplateGitHubLucCharlie NolanPollardTheDragonPopeDaveThe3thBurzahChugaArthriToastical
 		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
PollardTheDragonandGitHub edeea0af27 Fixes electrocution effect (#30204) 
* Fixes electrocution effect

* Purges spare effect
 2025-08-22 15:19:49 +00:00
ContrabangandGitHub 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
ContrabangandGitHub 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
Charlie NolanandGitHub 1d6d9e6d64 Prevent landmarks from always hard deleting. (#30183) 2025-08-21 20:21:14 +00:00
PollardTheDragonandGitHub 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
ContrabangandGitHub 012a00aafb Refactors large crates. Adds sound and makes them not-instant. (#30068) 
* bonk

* refactors large crates
 2025-08-19 13:23:16 +00:00
kyunkyunkyunandGitHub 1f461fe2d2 Nullify all armor that is equal to armor = null (#30116) 
* nullifier

* manually remove identical vars
 2025-08-19 13:13:41 +00:00
QwertytofortyandGitHub 19172782f7 gives it disk sounds (#30106) 2025-08-19 06:28:02 +00:00
Charlie NolanandGitHub 705a71a003 Fix Raw Gas Scan (#30120) 2025-08-19 01:16:43 +00:00
kyunkyunkyunandGitHub 80c2bb78e4 chameleon kit for ghost bar (#30025) 2025-08-19 00:39:23 +00:00
BurzahandGitHub ed35e46fb1 acidproof (#30044) 2025-08-19 00:28:36 +00:00