cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,431 Commits 26 Branches 2 Tags
349eca230ca698662b722df94f93dabbbb5bb3f0
Commit Graph

26303 Commits

Author SHA1 Message Date
warriorstar-orion
349eca230c mapmerge: Separate DMM conflicts for distinct atom root types. (#22609) 
* Separate DMM conflicts for distinct atom root types.

* clarify order of operations
 2023-11-01 20:37:18 +00:00
Nathan Winters
b8e98144c6 Tones down the demand for Ash (#22923) 
* Make oil fireflash depend on remaining empty space

* Split feedback message

* Update oil fireflash size scaling

* Slightly buff oil -> ash production

* Clarify feedback messages

* Make violent oil fireflashes not produce ash

* Make charcoal recipe require less ash

* Violence begone
 2023-11-01 20:15:48 +00:00
GDN
65cab6910f adds a pulse demon demon heart (#22810) 
* adds a pulse demon demon heart

* fixes + shock HARDER
 2023-11-01 20:13:12 +00:00
Contrabang
94b9f85a7c Adds tabs to the cling menu (#22902) 
* cling menu

* Update code/modules/antagonists/changeling/changeling_power.dm

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

* comment added

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-01 20:11:44 +00:00
Qwertytoforty
ed8406d707 You have unlocked: Greedier mode! (#22884) 
* You have unlocked: Greedier mode!

* Apply suggestions from code review

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

* Update debuffs.dm

* Apply suggestions from code review

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

---------

Co-authored-by: Luc <89928798+lewcc@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-11-01 20:11:08 +00:00
GDN
e7b396eddf Silicon Chamo properly hides huds (#22312) 
* hide hud

* more documentation

* Update code/modules/mob/mob_vars.dm

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

* Update code/modules/mob/mob_vars.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-11-01 20:10:15 +00:00
Qwertytoforty
357c62b6d7 Ports hitscan from TG, adds it to *SELECT* things (#22754) 
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)

* ai turret

* Coca cola, don't forget the ice. Or the pulse

* almost done, pull master than map edit

* we ball

* ah, chasms.

* it's for the best. Fuck should not sleep checker though

* hitscan reflection limiting system

* Apply suggestions from code review

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

* c-c-c-changes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-11-01 20:05:27 +00:00
Luc
95d3a49929 Ports Malf AI rolling (and some other tipping refactors) (#21900) 
* some thoughts

* I really forgot to commit all of this didn't I

* Rework vendor crits

* fixes some angle jank

* yeag

* Patches up most bugs with tilting things over

* Fixes up most of the AI logic

* rolling AI can now take teleporters, visual effect is now only seen by the AI

* better effects

* Remove a bunch of now useless code

* I keep forgetting this

* cleanup in aisle seven

* oops

* some more testing

* adminbus hours

* Fixes some buildmode stuff, does some more testing

* Add documentation

* Demo bugs

* Apply suggestions from code review

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

* rework crit damage amount

* Adapt recent tg changes

* Fix some small bugs in testing, contra review 1

* contra review 2

* Fixes tipping with pacifism

* restore removed icons

* Fix some remote untipping

* restore the roll action

* finally address contra's review (sorry)

* remove debug tool

* Move untilt logic into component

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-31 20:24:52 +00:00
DGamerL
49afcce327 Purging the wishgranter (#22976) 
* Everything except the map

* Deletes the ruin

* Makes CI not fail

* I pray this fixes it
 2023-10-31 18:46:43 +00:00
Mitchs98
c027e8af60 woopsiedaisy uwu (#23087) 2023-10-31 18:41:59 +00:00
Bakaface
6470b078a2 Feature/puts other cubes in biogenerator (#23077) 
* adds the other types of meat cubes into the biogenerator

* Revert "adds the other types of meat cubes into the biogenerator"

This reverts commit c6f710c29e.

* adds the other types of meat cubes into the biogenerator
 2023-10-31 18:41:05 +00:00
JimKil3
233cc473fe Toilet water changes (#23080) 
* hgcvhgfcjtfckhc

* Update code/modules/reagents/chemistry/reagents/water.dm

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

* never make me balance team please

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-31 18:37:43 +00:00
JimKil3
a5812e0245 Dionae can now drop nymphs they've picked up (#23020) 
* the feature

* sirryan review

* oopsies
(adds an #undef)
 2023-10-31 18:36:53 +00:00
GDN
f6d3f955dc lets people open their character creator before SSatoms is set up (#22986) 2023-10-31 18:35:45 +00:00
matttheficus
7e7f03c906 Elite Tactical Magboots (#22968) 
* here we go

* notes

* sprites

* this is needed

* some tweaks to gear

* nit

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

* fix this

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-10-31 18:35:05 +00:00
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