cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 15:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

26638 Commits

Author SHA1 Message Date
Ninetoes3
e5b668a1d1 Return of Var on Cyberiad (#22674) 
* Update cat.dm

* forsaken cat change

* Update code/modules/mob/living/simple_animal/friendly/cat.dm

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

* Update feral_cat.dm

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-31 15:48:20 +00:00
ppi13
661366b53b [s] Observers are immune to shuttlecrush (#23108) 
* observers are now immune to shuttlecrush

* Moves it a step
 2023-10-31 14:54:52 +01:00
Deniz
8e612d9f8e TGUI: HonkBot (#22999) 
* TGUI

* ui_data

* why am I coding even?

* size

* Update code/modules/mob/living/simple_animal/bot/honkbot.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* dunno

* bundle

* bundle

---------

Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-30 19:31:12 +00:00
S34N
49b0071400 Repaths some decals, makes copyTurf copy decals (#22528) 
* why do I do this to myself

* pass 2

* maps

* delete this

* PR number obtained

* Revert "maps"

This reverts commit 87926f4a0c.

* maps
 2023-10-30 20:15:14 +01:00
DGamerL
0366df0641 Fixes AI eyes able to be shuttlecrushed (#23085) 
* Fixes it

* Contra review
 2023-10-30 20:12:18 +01:00
DGamerL
cb511ae725 Fixes it all, I hate it (#23008) 2023-10-30 19:10:39 +00:00
Bjamcham
3e4cb4c25a Expanded ghost gas analyzer (#22914) 
* Please don't shoot me this time

* Added descriptor

* This one actually works, please don't shoot me

* Spacing fix

* proper documentation
 2023-10-30 19:09:37 +00:00
Qwertytoforty
9bb010b9ab some tweaks for hardmode (#22809) 
* some tweaks for hardmode

* Update colossus.dm

* fail safes / other fixes

* oops pressed compile but had an active thing open

* bubblegum nerfs

* nerfs the self healing on guidance

* crusher bubble care

* and finally, the portal to the second arena, so a rescue might happen. Maybe.

* oh right the legion core related murders

* lets not make modsuit users suffer

* oops

* whoops

* fixes legion loot

* changes requested

* terminal smooth brain

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

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

* comment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-30 19:08:49 +00:00
JimKil3
a7568f73b4 Fixes slime people physique not showing (#23083) 
* damn you octus!

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

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

* fixes contras suggestion

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-30 16:45:25 +00:00
Henri215
de50855e45 TG port: New display, pod control and request console sprites (#22979) 
* TG port: New display, pod control and
request console sprites

* fixing pod control sprite animation speed
 2023-10-29 20:55:39 +00:00
Deniz
27dcf8c04a 520 (#23057) 
Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com>
 2023-10-29 21:06:54 +01:00
BiancaWilkson
4ac6435015 cheeseless cheese (#23047) 2023-10-29 21:06:42 +01:00
JimKil3
cfef9d1bf2 Tweaks *twirl (#22882) 
* twirling

* redoes everything

* damnit lewc

* early return
 2023-10-29 21:03:28 +01:00
Deniz
c59c62504a TGUI: Floobot (#22558) 
* commented out

* deleted bridge mode and targetdirection

* Fixes replace tiles bug

* Autotile - Damaged floor fix

* TGUI Floorbot Initial commit

* Update code/modules/mob/living/simple_animal/bot/floorbot.dm

review commit - moves bot specific down a line

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

* unused import

* updated spacing , list to box

* Moved comment

* test ignore

* IT WORKS YAY

* fixed branch + bundle

* waiting refactor

* spacing. think this is the last edit

* spacing

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

* merge conflict

* bundle

---------

Co-authored-by: Deniz <66401072+Oyu-De@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-29 19:18:41 +00:00
Qwertytoforty
c98ca1c9b6 eyes of yellow, scales and feathers, tails and teathers, turn the lights off (#22783) 2023-10-29 10:19:57 +00:00
1080pCat
5f38561464 Janitorial ERT rekit/buff and a few additions for the jani ert squad. (#22913) 
* jani ert buffs yummy

* yipiee

* beh

* Bruzah and DGL review

* Update ert_outfits.dm
 2023-10-29 10:19:08 +00:00
Qwertytoforty
3dc52b9f1f Reworks some trader pools. (#22969) 
* oh boy let us have some heads roll

* le comma au chocolate

* perhaps we we want them to be able to build it

* mmm ice cream sandwich cereal

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

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

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

* lablled

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* solcase

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-10-29 10:18:35 +00:00
Henri215
7474cf10aa Sentry bot no longer drops ed209 loot when destroyed (#23043) 2023-10-29 10:16:38 +00:00
Bjamcham
f903b78078 I plead whoops (#23045) 2023-10-29 10:16:17 +00:00
Mitchs98
6f4b4a3b65 onion (#23073) 2023-10-29 10:15:11 +00:00
Mitchs98
e8ab249eda First Course; Soups, Salads, Sandwiches! Splits food.dmi in preparation for future PRs. (#22866) 
* ORDER UP

* whoops

* slimes ur jelly sammich

* whoops 2

* prettier pretty patties

* whoops 3

* the splittening

* Henri review

* contra review + repathening

* salad bowl

* contra review 3.0

* renamed plain burger to burger, clarified need for abstract item

* DG Review
 2023-10-28 21:28:56 +02:00
PollardTheDragon
7480179907 Adds Vox Jumpsuits to Loadout Screen - Rebuilt PR #22537 to fix DMI Conflict (#22694) 
* Rebuilt PR #22537 to fix DMI Conflict

* Removed Coverage Limitation on Vox Jumpsuit

* Revised Descriptions for Vox Clothes to fit lore

* Grammar Fixes

* Adjusted Loadout Descriptions to match

* Onboard, not Aboard.
 2023-10-28 21:24:42 +02:00
Octus
6f0a93c672 Adds Characther Descriptors (Height and Build) (#22417) 
* char descriptors

* ok well it works somewhat

* I LOVE FIXING SHIT OORAH

* fixes

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

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

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

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

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

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

* Update code/modules/client/preference/character.dm

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

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

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

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

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

* Update code/modules/client/preference/link_processing.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* ok we love our fixes

* Update SQL/updates/51-52.sql

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* reverts and sql change to fix

* yeppers

* Update SQL/paradise_schema.sql

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa's review

* grammar

* Update code/modules/client/preference/link_processing.dm

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

* improves grammar

* Create 52-32.sql

* lmao please dont look at the change for this

* glob list

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

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

* y

* mhmhmh

* autodoc

* grgrgrggrg contra review

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-10-28 18:16:52 +01:00
PopeDaveThe3th
b8396ee74b Updates the ARG's description (#23035) 
* Update's the ARG's description

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-27 20:21:15 +01:00
BiancaWilkson
115ab60f72 Adds a syndicate soap upgrade for janitor borgs (#23033) 
* red

* whitespace fix

* i love being literate

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-27 20:20:27 +01:00
Aylong
d734800132 Fix: Slices random position (#23021) 2023-10-27 20:20:06 +01:00
Christasmurf
eed4890be5 white beret (#23013) 2023-10-27 20:19:45 +01:00
Qwertytoforty
3c374a6386 medbeams now heal ipcs since it is the future (#23012) 
* medbeams now heal ipcs since it is the future

* scope it to human
 2023-10-27 20:19:27 +01:00
DGamerL
e22fb02ef2 Fixes zaps focusing APCs over everything* (#22991) 
* The fix

* Extra performance
 2023-10-27 20:18:39 +01:00
Contrabang
d7d68d126f Adds CI to prevent areas on station without APCs (#22515) 
* areas apcs

* oops

* okay lets try this!

* these too

* a lot more changes

* cmon
 2023-10-27 18:11:10 +01:00
DGamerL
b31e548c25 Moves the can_leave_fibers var to /obj/item/clothing instead of being on /atom (#23005) 
* Ezpz

* GDN review

* Belts aren't clothing

* Update code/modules/clothing/clothing.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-10-26 10:41:55 +01:00
Vi3trice
85353104f7 text be gone (#22929) 2023-10-26 10:39:11 +01:00
Daniel Lenrd
0c383028b6 Allows chemistry beaker swapping (#22915) 
* Added Beaker Swapping

* Moving repeated code

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

* Moving repeated code 2

* Updated text to be "inside" rather that "on top"

* proper grammar

* removes excitement for placing a beaker

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-26 10:33:16 +01:00
Bjamcham
1bbe3c92b6 Adds a firefighting module to atmospherics MODsuits (#22829) 
* It just works

* Old code my beloathed

* I hate old code so much

* I'm quite blind

* Switch Spacing

* One more...

* Slightly less codersprite

* Mode examine info
 2023-10-26 10:32:56 +01:00
Adrer
223cd99fd2 Reagent Grinder TGUI (#22645) 
* Reagent Grinder TGUI

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

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

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

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

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

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

* Requested changes

* Fixed import issues

* Added operating component to KitchenMachine.js

* Remember to push the bundle

* Update tgui/packages/tgui/interfaces/ReagentGrinder.js

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Biogenerator processing change

* Updated bundle

* Fixes biogenerator processing

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

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

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

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

* Update tgui/packages/tgui/interfaces/KitchenMachine.js

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Use config over sending name along with data

* Ran prettier

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Updated description on Operating

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Missing parenthesis

* Missing parenthesis

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-26 10:31:04 +01:00
Qwertytoforty
55d696b593 [s] Fixes an issue with bubblegum (#23027) 
* no we do NOT need you getting into the admin room THANK YOU

* give it a break
 2023-10-25 16:46:59 -04:00
DGamerL
3388035c12 [s] Fixes an unathi nerf (#23019) 
* The fix

* Removes parentheses
 2023-10-24 23:51:49 +02:00
GDN
53589e559c fixes an omni od runtime (#23016) 2023-10-24 22:15:55 +02:00
Deniz
eaa41485f9 Floorbot bug fix + Bridgemode Removal (#22531) 
* commented out

* deleted bridge mode and targetdirection

* Fixes replace tiles bug

* Autotile - Damaged floor fix

* Break_tile var moved up. SHOULD be final

* Update code/modules/mob/living/simple_animal/bot/floorbot.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-22 13:14:58 -04:00
Contrabang
bec3ef912b Removing accessories from a jumpsuit is now a radial menu (#22696) 
* accessory + helper

* elper

* okay, less insanity

* lewc review
 2023-10-22 13:00:18 -04:00
Henri215
00d7010702 PDA free DLC: New ringtones! (#22945) 
* PDA free DLC: New ringtones!

* name tweaks
 2023-10-22 12:54:32 -04:00
Varelion
a60bfdf934 AltClick() Deck Shuffle (#22924) 
* Update tarot.dm

Allow shuffle through AltClick(), reduce shuffle time.

* Update cards.dm

Allow AltClick to shuffle the deck.

* Updated tarot.dm

Removed the tarot shuffle, as it was already inherited from deck's new AltClick shuffle option.

* Update cards.dm

Lowered cooldown on cards.dm to match tarot.dm

* Change tarot.dm and cards.dm

Changed shuffling cooldown time from 5 seconds to one second.
 2023-10-22 12:54:09 -04:00
BiancaWilkson
b508640e39 IPCs can die from low power (#22846) 
* im so not full from electricity grrr

* Update code/modules/mob/living/carbon/human/species/machine.dm

whitespace fix

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* now its the microbattery dying

* Update code/modules/mob/living/carbon/human/species/machine.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-22 12:52:51 -04:00
Vi3trice
a85d65d6d3 hey dawg i heard you like lights (#22821) 2023-10-22 12:51:57 -04:00
Contrabang
12b73a4d45 Improves admin interaction with AIs (#22769) 
* admin-ai improvements

* Update code/modules/admin/misc_admin_procs.dm

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

* brug

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-10-22 12:49:59 -04:00
Sadhorizon
d3ea6b2620 Remaps the Lavaland Outpost. Again. (#22391) 
* a remap begins...

* tweaks

* bye-bye, QM's handheld crew monitor

* brings back the abandoned crate

* oop

* more tweaks

* tcomm pipes

* brad update

* more firelocks

* more windows

* tweaks

* denth review part 1

* renaming doors

* crowbars

* changes walls, new locker

* Oyu's review

* more tweaks

* signs

* MAYBE will be deconflicted

* now deconfllicted hopefully

* some more tweaks

* no more wall helpers!

* fluff

* IDs for polarized windows

* slight tweaks to firelocks

* added grilles

* more tweaks

* tiny lil maint update

* more maint tweaks

* maint rework part 3

* oopsie

* jani has dark floors now

* reworked robotics, gave brad more love

* stationary defibs

* stuff

* bug fix

* more tweaks

* aaaaa

* Revert "aaaaa"

This reverts commit f70ba3a89a.

* more tweaks

* fixed scrubbers, tweaks

* should compile

* reshuffles maint loot

* request consoles + tweaks

* more tweaks

* access helper tweaks

* very minor access tweaks

* you can now pet Brad

* Update code/modules/mob/living/simple_animal/friendly/cockroach.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* renames access

* shuttle decorations + other tweaks

* oopsie

* bjam's reviews

* split the QM's locker
Exa's approval, rest of design team did not share opinions

* OH UH

* this too

* this is a better way to do it actually

* sean review + floodlight subtype

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-21 21:30:28 +01:00
GDN
95f691534a fixes an infinite loop (#22982) 2023-10-21 12:24:36 -04:00
Adrer
cccf324773 Reroll destroy AI objective when the AI goes to cryo (#22352) 
* Reroll destroy AI objective on cryo

* Update code/modules/mob/living/silicon/ai/latejoin.dm

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

* Update code/game/gamemodes/objective.dm

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

* Update code/game/gamemodes/objective.dm

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

* Update code/game/gamemodes/objective.dm

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

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-21 13:33:30 +01:00
Qwertytoforty
3f97819910 YOU DARE QUESTION THE WORDS OF THE MIGHTY JIMMY? (#22892) 2023-10-21 12:42:21 +01:00
Contrabang
97453a5b61 bam (#22880) 2023-10-20 20:38:26 -04:00