cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,323 Commits 26 Branches 2 Tags
a4b1ac0444aa3a8fcd021aebca2f8aede0ac249c
Commit Graph

11564 Commits

Author SHA1 Message Date
Contrabang
5b368c3f8f Renames some pre_attack arguments (#30324) 
* Renames some pre_attack arguments

* fix
 2025-09-04 07:11:59 +00:00
Contrabang
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
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
Contrabang
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-orion
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
kyunkyunkyun
ca8e5a6a7d nerf that water (#30209) 2025-09-02 05:53:52 +00:00
Contrabang
e1f42f4673 pre_attack change (#30305) 2025-09-01 21:10:58 +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
kyunkyunkyun
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
Contrabang
01ebc0245b Transit tubes are now dense when they have gravity (#30073) 2025-08-29 16:42:53 +00:00
Osetrokarasek
90af6975e6 Fixing knifes material amount (#30323) 2025-08-29 15:19:17 +00:00
Contrabang
b4724b63fa More Suture Changes (#30164) 
* more suture changes

* grammar
 2025-08-28 23:10:32 +00:00
Chap
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
Chap
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
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
PollardTheDragon
a3d9ecf4c9 Fixes gutlunch controllers (#30277) 2025-08-28 14:48:38 +00:00
Osetrokarasek
a9a8fd6233 muvgth (#30139) 2025-08-26 01:51:47 +00:00
Osetrokarasek
97047c3bb9 Emptying Lathed Welding Tools And Extinguishers (#30137) 
* asfgdsa

* cnrbangn rqerqest chaengs...
 2025-08-26 01:49:10 +00:00
SchrodingersWolf
00cbe5f9c4 Splints are now appliable to chest, lower body, hands and legs (#30124) 2025-08-26 01:47:43 +00:00
CRUNCH
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
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
PopeDaveThe3th
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
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
PollardTheDragon
edeea0af27 Fixes electrocution effect (#30204) 
* Fixes electrocution effect

* Purges spare effect
 2025-08-22 15:19:49 +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
Charlie Nolan
1d6d9e6d64 Prevent landmarks from always hard deleting. (#30183) 2025-08-21 20:21:14 +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
kyunkyunkyun
1f461fe2d2 Nullify all armor that is equal to armor = null (#30116) 
* nullifier

* manually remove identical vars
 2025-08-19 13:13:41 +00:00
Qwertytoforty
19172782f7 gives it disk sounds (#30106) 2025-08-19 06:28:02 +00:00
Charlie Nolan
705a71a003 Fix Raw Gas Scan (#30120) 2025-08-19 01:16:43 +00:00
kyunkyunkyun
80c2bb78e4 chameleon kit for ghost bar (#30025) 2025-08-19 00:39:23 +00:00
Burzah
ed35e46fb1 acidproof (#30044) 2025-08-19 00:28:36 +00:00
Alan
24c47a3d79 Rework spray bottles and tools based on them somewhat. (#29977) 
* Rework spray bottles and tools based on them somewhat.

Consolidate spray adjustment functions.
Change method of preventing spray amount adjustment.
Standardize most spray amounts at 10u/2 tiles and 5u/1 tile.
Should fix the following issues:
https://github.com/ParadiseSS13/Paradise/issues/29930
https://github.com/ParadiseSS13/Paradise/issues/28964

* Adjust spray rework based on review comments

Change `adjustable` var to boolean
Change `adjust_verb` to `adjust_action`
Tie spray transfer amount to tile reach
 2025-08-19 00:26:53 +00:00
Contrabang
5b0447edcc Makes automenders rarer. Adds sutures/regenerative meshes. (#30003) 
* suture

* tweak

* bio 6 -> bio 7

* tweak bleed supression

* review

* Update code/game/objects/items/stacks/medical_packs.dm

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-08-17 20:12:44 +00:00
iramoye
94f137c41c Renames Zvezhan to Cygni Standard (#29965) 
* looks good to me

* replaces mentions of humans

* Revert "looks good to me", as Trinary is not being replaced

This reverts commit 275aca6adb.

* removes a duplicated bot init

* wooooo

* fixes tgui stuff

* adds sql
 2025-08-15 06:41:27 +00:00
kyunkyunkyun
c04f986bc0 remove (#30103) 2025-08-15 04:17:18 +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
Seren Highwater.
207695cbda Adds Turtlenecks for Various Command Members. (#29948) 
* add sprites

* obj

* CMO turtlenecks

* turtle code

* CODE

* everythig

* fixes

* HOP FIX

* super fix ultra fix look at this fucking fix

* done

* config fix

* tiny fix

* test

* test 2

* desc

* hop desc

* Move all the non-weapons out of code/game/objects/weapons (#29820)

* Update bartender mob and obj sprites for relevant species (#29889)

* Update bartender mob and obj sprites for relevant species

* Add bartender uniform rolldowns, inhands. Minor color fixes.

* Revert "Update bartender mob and obj sprites for relevant species (#29889)"

This reverts commit afc4389871.

NVM

---------

Signed-off-by: Seren Highwater.  <102489377+SerenHighwater@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Alan <alfalfascout@users.noreply.github.com>
 2025-08-13 20:45:12 +00:00
Burzah
a5c2080c9d Fixes nullspace inventory issue (#30092) 
* storage test

* an actual fix

* removed wrapper
 2025-08-12 08:38:51 +00:00
Alan
fb42a234f2 Resprite chef outfit for relevant species, icons (#29959) 
* Resprite chef outfit for relevant species, icons

Change underclothing for human, drask, grey, kidan, vox, human, inventory, inhand.
Change uniform and helmet for plasmaman, including inventory icon.
Change hat for human, drask, grey, kidan, vox, corgi, inventory, and inhand.
Change belt (apron) for human, inventory, and inhand. Add new belt files for kidan and vox.
Change chef code to support new items for species and hands that didn't have them before.

* Remove identical belt file path, caught by linter
 2025-08-12 06:10:58 +00:00
Toastical
15cdc436d5 fix extinguishers not going into backpack when safety is off (#30055) 
* fix extinguishers not going into backpack when safety is off

* Update code/game/objects/items/weapons/extinguisher.dm

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

---------

Signed-off-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-08-12 03:23: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
Contrabang
0b16de5266 "Fireball" unique wizard loadout is now explosion-proof. (#29963) 
* fireball wiz angry

* oops

* tweak to code
 2025-08-10 14:40:10 +00:00
Contrabang
5f7b650401 Fixes for #29996 (#30005) 2025-08-10 14:34:04 +00:00