cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 14:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,073 Commits 26 Branches 2 Tags
0d968d78038d37b41ecd2886a1d77d13f43c19a5
Commit Graph

11311 Commits

Author SHA1 Message Date
Tojo
0d968d7803 Reworks Curtains (#28163) 
* Reworks Curtains

* Update code/game/objects/structures/curtains.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* New Overlay Code

* THE BEGINNING OF HELL

* Interact with Atom on mountable

* Fixes return, looks mergable.

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update Overlays Refactor

---------

Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-02-26 09:58:51 +00:00
Toastical
202249a137 migrates /obj/effect to the new attack chain (#28066) 
* the great migration

* pleasing the linter

* whoops

* smol fixes

* review

* hallucination attack proc

---------

Co-authored-by: Toastical <toast@toaster.com>
Co-authored-by: Toastical <toastical@toaster.com>
 2025-02-26 09:45:18 +00:00
McRamon
f54a49333b Soap resprite2: electric boogaloo (#28287) 
* sprites

* code

* damn you crunch

* s

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

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

* abductor fix

---------

Signed-off-by: McRamon <31545294+McRamon@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-02-24 16:21:47 +00:00
Toastical
72bf019b42 changed the proc (#28249) 
Co-authored-by: Toastical <toastical@toaster.com>
 2025-02-24 16:11:04 +00:00
Drsmail
7af5bd0783 Make the cigar bigger, so I can pack some explosives there. (#28443) 2025-02-24 16:10:12 +00:00
Silverplate
f9c7f9f118 Fixes a runtime in PDA gas scanner code (#28310) 
* Runtime fix

* Chuga review

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* forgot I changed these too.

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

---------

Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
 2025-02-24 16:08:56 +00:00
chuga-git
38642d5888 CI lint for UID() misuse (#28465) 
* Adds CI check for UID() being passed parameters.

* Fixes cases of UID() being passed parameters.
 2025-02-21 19:35:02 +00:00
Vi3trice
0848550a2f oi have you got a loicense for that hologram (#28330) 2025-02-20 20:02:11 +00:00
kyunkyunkyun
d701f58e43 tweak again (#28437) 2025-02-20 19:47:34 +00:00
chuga-git
a08280714c removes check_block() and martial art block_chance (#28399) 2025-02-20 15:08:21 +00:00
CRUNCH
39142470e8 Mop, Mop Bucket, and Janicart Refactor (#28049) 
* Update mop.dm

* This... Is a bucket

* Dear god...

* Update janicart.dm

* There's more

* No!

* Finished?

* newline

* Update janicart.dm

* Update mop.dm

* Update mop.dm

* Update mop.dm
 2025-02-18 11:13:05 +00:00
CRUNCH
d05cc7c5cb Migrates /obj/item/melee/baton to the new Attack Chain, Adds Universal Poking (#28241) 
* Update stunbaton.dm

* Update stunbaton.dm

* update

* Update stunbaton.dm

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

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

* update based on review

* Create test_attack_chain_stunbaton.dm

* update

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-02-18 11:11:13 +00:00
chuga-git
570b45a903 refactors some item transfers to use transfer_item_to() (#28405) 2025-02-18 10:38:09 +00:00
Drsmail
b9bd42ff21 initial (#28430) 2025-02-17 17:38:06 +00:00
Charlie Nolan
04ed0efe88 Less magical flamethrowers (#28412) 2025-02-15 18:24:41 +00:00
CRUNCH
bfad632d10 Migrates /obj/item/borg/stun to the new attack chain. (#28221) 
* Update robot_items.dm

* if () > if()

* Apply suggestions from code review

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update code/game/objects/items/robot/robot_items.dm

Co-authored-by: Burzah <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: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-02-15 07:48:22 +00:00
Charlie Nolan
6b13c9d182 Remove admin detector (#28401) 2025-02-15 06:51:09 +00:00
Christasmurf
acbe712c25 Gives evidence room its own access (#28217) 
* new access level

* comma

* more commas (rat bastards)

* finally got them all

* mapping changes

* Update code/game/jobs/access.dm

remember your punctuation

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
 2025-02-13 19:06:01 +00:00
Marm
719fe612d2 Botany QOL, Loadout Update (#28232) 
* No seriously why didn't I?

* that should fix that
 2025-02-13 02:25:38 +00:00
Vi3trice
de79795367 that's a lot of actions (#28067) 
Why did the crusher have a spawn? No idea.

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-02-13 01:38:33 +00:00
Charlie Nolan
194e851b8f SSair performance improvements (#28271) 2025-02-12 22:39:09 +00:00
Sheep
2e2a778a71 Paraplegia! (#27999) 
* Can pick paraplegic in character menu, will start floored+wheelchaired

* Why won't you show up on scanners

* Forgot the description.

* Got the scanners to show Paraplegia!

* block off some roles from paraplegics

* Use stance instead of the floored trait for paraplegic

* Prevent paraplegics from using/being hit by legsweeps, change get_num_legs()

* Add DNA injectors for paraplegia

* change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps

* Can pick paraplegic in character menu, will start floored+wheelchaired

* Why won't you show up on scanners

* Forgot the description.

* Got the scanners to show Paraplegia!

* block off some roles from paraplegics

* Use stance instead of the floored trait for paraplegic

* Prevent paraplegics from using/being hit by legsweeps, change get_num_legs()

* Add DNA injectors for paraplegia

* change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps

* whoops.

* TGUI.

* How did I miss that in testing

* Add the point interaction that nuggets get to armless paraplegics

* Update code/modules/mob/living/carbon/human/human_organs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>

---------

Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Scribble-Sheep <15377810-AlyxisDrayko@users.noreply.gitlab.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-02-12 22:36:22 +00:00
Arthri
b472a861fa Allow decompilation of shrapnel and cardboard tubes (#28306) 
* Allow decompilation of shrapnel, cardboard tubes, ammo boxes and magazines

* Do not allow decompilation of magazines

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
 2025-02-12 22:25:12 +00:00
BiancaWilkson
4fdc79ca90 Cyborg Inventory Refactor (#27788) 
* Initial variable changes

* Add defines

* oh my god huds

* Removes update_items(), it seems useless but this might need reverting later

* the hud doesn't work but the inventory itself seems to

* Renames a var, gets inventory working properly

* Activation/Deactivation support, ore bag fixed

* Fixes CL and also this would have been a massive, hilarious bug

* Apply suggestions from code review

Dr and Lewc reviews

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Update code/_onclick/hud/robot_hud.dm

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

* Fixes a comment

* Wait I forgot this worked like this for a reason

* Lewc Suggestions

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

* Burza Suggestions

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

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-02-12 21:55:11 +00:00
kyunkyunkyun
e6c6888a4f Fix CQC slapper (#28342) 
* fix slapper drop

* Apply code review

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

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-02-12 21:49:53 +00:00
Vi3trice
baad3135c9 I question some people (#28208) 2025-02-12 13:19:06 +00:00
Vi3trice
c1d08844df don't spout nonsense and still make it end you when needed (#28093) 2025-02-10 03:31:37 +00:00
PopeDaveThe3th
3ace66e481 [LORE] Replaces all uses of the word "intergalactic" in code (#28203) 
* begone

* Update SSshuttles.dm

* Update mail.dm
 2025-02-10 03:02:09 +00:00
1080pCat
4ba6266516 exploit fix (#28319) 2025-02-09 23:51:38 +00:00
CRUNCH
d9e6e40ed0 The Great Fire Extinguisher Refactor (#28005) 
* Creation (suffering), success

* AGHHHH! SPACES!

* Update watertank.dm

* comment update

* Apply suggestions from code review

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
 2025-02-09 18:13:20 +00:00
Spaghetti-bit
32c9d4d682 Slime People and IPC; Imitating Species Cosmetically. (#27359) 
* Pain

* More transparency / alpha

* Vulp + Name override

* more transparency alpha stuff

* Reworks species subtype for slimepeople

* Iteration 3...

* Me when initial

* 60 - 61

* Character.dm select query changes.

* 61-62

* The real 61-62

* Update to IPC imitation

* +63-64.sql
> species_subtype after pda_ringtone

IPC identity configuration surgery.

Slime "Morph" action: 10 seconds. Allows a slime person to change how they look.
> Same cost as regenerating a limb.

Link processing subspecies implement.

* Pain2

* SQL

* Frankenstein monster fix

* Slimify! ...no longer applies to robotic limbs.

* 220 Alpha to 200

* Ordering issue fix.

* Last ordering issue.

* aa review, paradise_schema.sql

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2025-02-09 15:59:57 +00:00
Mira
659c4bb47e Add debug research notes (#28074) 
* debug research notes

* delete /obj/item/research

* remove researchnotes type
 2025-02-06 14:40:55 +00:00
DGamerL
16407c641b Makes ui buttons call the right proc (#28267) 2025-02-05 21:32:56 +00:00
DGamerL
1c4a5180ed Fixes runtimes when you talk with a cig butt in your mouth (#28250) 
* Minor fixes

* Oops

* Funnyman review
 2025-02-05 21:26:20 +00:00
Contrabang
3ac3fe2157 bongo (#28263) 2025-02-05 20:13:31 +00:00
Charlie Nolan
37dfa541c3 Spiderlings on move_manager (#28244) 2025-02-05 18:22:47 +00:00
CRUNCH
eab51e167d Migrates /obj/item/scratch to the new attack chain (#28177) 
* Update scratch_card.dm

* Update scratch_card.dm
 2025-02-05 15:15:13 +00:00
Contrabang
e3f73e178d Changes a lot of lighting colors, ranges, and powers (#28226) 
* 8u hiubntgvby9 gb

* colors

* undo airlock

* bluer light

* spaghetti review
 2025-02-04 19:30:09 +00:00
DGamerL
dfd642799c Cigar(ette) butts now stay in your mask sot when they burn out (#27989) 
* FINALLY

* Try to fix linters

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-02-04 08:02:39 +00:00
PopeDaveThe3th
94c46040ea [FEAT] Adds Federation combat webbing (#28085) 
* the webbening

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

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

* Update trader_organization_spawners.dm

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

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

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

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2025-02-02 16:35:37 +00:00
Vi3trice
7bf8a6ab9c He's toast (#28110) 2025-02-02 02:56:30 +00:00
Toastical
760a6f3466 magic key go in backpack again (#28189) 
* magic key go in backpack

* better way

---------

Co-authored-by: Toastical <toast@toaster.com>
 2025-02-02 02:28:00 +00:00
Mira
fe53f56d8b Fix standing corpse when unbuckling it from a meat spike (#28037) 
* fix lying angle

* it's not even necessary
 2025-01-31 20:56:10 +00:00
ExusA
22865d67f6 Potted plants size categories (#28046) 
* Updated potted plants

* Proper randomization and reorganization

* Update Kirbyplants on maps

* Remove redundant icon_state

* Revert "Remove redundant icon_state"

This reverts commit bf51470687.

* Update icon-state for generic kirbyplants

* Fix Initialize argument

* Typo fix

* Typo fix 2

* Typo fix 3

* Update plants.dmi

* Add typepath update script

* Add hiding to medium plants and hiding feedback

* add names indicating size

* add 2 more medium plants to medium

* typo fix
 2025-01-31 15:52:30 +00:00
warriorstar-orion
b7b3149b7f Fix portals floating in space. (#28097) 2025-01-31 15:52:05 +00:00
CRUNCH
6ef209d931 Migrates Borg Gripper to New Attack Chain, Fixes Some Bugs (#28139) 
* Creation

* Update firealarm.dm

* Update firealarm.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* Update cyborg_gripper.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-01-31 15:50:15 +00:00
Vi3trice
9a7aee88bd Cauterize surgery checks for lit implements, tweak lighter/flamethrowers/cautery so they deal burn when appropriate (#28141) 
* stay cool

* Cautery is also weird like that too
 2025-01-30 05:26:13 +00:00
Migratingcocofruit
f47f0de0b5 Corrects the pressure readouts on non-detailed gas reports (#28174) 2025-01-30 05:23:00 +00:00
Charlie Nolan
a6d347e14a Custom, crew-buildable vendors (#28009) 
* Buildable vendors.

* Lint.

* I think this is right?

* It's already IN their hands.

* Lint, re-check item after prompting for price.

* Fixes.

* Review fixes, working dissassembly again.

* Apply suggestions from code review

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

* Restrict appearance to buildable vendor sprites.

* tyop fix

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-01-28 22:00:14 +00:00
Toastical
4c72e2c11b fixes door remotes (#28140) 
Co-authored-by: Toastical <toast@toaster.com>
 2025-01-28 21:19:27 +00:00