cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,411 Commits 26 Branches 2 Tags
bd1e5e5142de1a4fa3eade7901a30ada358cfae2
Commit Graph

2390 Commits

Author SHA1 Message Date
GDN
3fc4b05b72 fixes weed node gc issues (#20194) 2023-01-15 18:10:51 -05:00
Henri215
b4e970eb90 Added pie cannon and spirit board to Sol Trader items (#20100) 
* Added pie cannon and spirit board to Sol Traders items

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-01-13 21:04:11 +01:00
Contrabang
d90b1a5f78 Pews now give 5 wood back when deconstructed (#20150) 
* pews now give 5 wood back

* vamptot chaplain

* Revert "vamptot chaplain"

This reverts commit 4d0a89c627.
 2023-01-13 21:01:40 +01:00
Eric6426-Blossom
ba1fa9fb63 Resprites Xeno structures. Adds Xeno Doors. Fixes and polishes a lot of issues and features of Xenos (#19978) 
* Benodoor1

* TheScopeOfThisPRisOutTheWindow

* BalancesDoor+GoodSounds

* Fixes Map Issues(?) - Mapedit by Lightfire

* FixesMapIssues for good

* Nests+WallWeeds(WIP)

* Doorforcing

* EggSprite

* Weed,Carbon,Wallchecks

* Spelling+cleanercomment1

* ReviewBatchTest

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

* Sirryan'sReviewBatchTest

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

* Sirryan'sReviewFinalBatch

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

* MoreFixesForReview

* Initializes+UserFeedbackWarns

* ForgorWallweedName

* SeanRequestsPart1

* SeanPart2

* SirryanReviewPart1

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

* TheWeedening

* SirryanReviewPart2

* CleaningLayer

* SirryanReviewPart1

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

* SirryanReviewPart2

* SirryanReview

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

* RemovingOldSprites

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2023-01-10 17:03:43 -05:00
Coolrune206
d08786fe8b Makes the crematorium able to be "broken" and fixed instead of destroyed. (#19878) 
* makes the crematorium indestructible

* cremator can now be broken instead

* woops I totally understand span

* thank you vietrice

* code comments

* Lewcc review

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

* I am the worst spriter, fight me

* probably should stop cremating if broken eh?

* slightly less shit coder sprite

* SEAAAAAAAAAN

* Sirryan Requests Pt1

* woops you didn't see this part

* Sirryan Requests Pt2 - Electric Boogaloo

* SteelSlayer review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-01-10 16:42:50 -05:00
Henri215
e711cd5921 Fixes lots of common spelling mistakes (#20086) 
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
 2023-01-08 20:12:31 -05:00
GDN
1a5ce03ec3 fixes the mopbucket not taking mops (#20013) 2023-01-06 21:57:19 +01:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867) 
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
 2023-01-03 20:59:35 +00:00
S34N
3f5882836f Fixes epic fail with reinforced glass tables (#19914) 
* really?

* shove stun
 2023-01-03 00:56:41 -05:00
Contrabang
d1c80c8802 welders on tables, wow (#20042) 2023-01-02 10:48:49 -05:00
Contrabang
eabc761d33 updates paramedic locker (#20041) 2022-12-31 01:28:18 -05:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006) 
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
 2022-12-29 14:28:40 +00:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897) 
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
 2022-12-27 11:00:39 -05:00
Contrabang
9a2c12e520 Allows the Long-Distance Cloning Machine to use Outfits (#19965) 
* Cloning Machine Outfits

* logging
 2022-12-26 12:38:31 -05:00
GDN
af85ed1e80 Fixes a table runtime (#19985) 
* fixes table runtimes

* ryan's suggestion
 2022-12-24 13:07:17 -05:00
GDN
67708cde4d Every day I hate alert more and more (#19980) 2022-12-24 11:04:46 -05:00
Adrer
2890de587f Makes Wooden Doors More Consistent (#19941) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2022-12-20 18:49:14 -05:00
Eric6426-Blossom
18b0e61235 Fixes Window-Pushing not updating sprites / staying anchored (doesn't delete cult this time) (#19851) 
* Fixes issue #19823
Makes bola-throwing check if the thrower is a cult before throw.

* WindowPushFixAgain

* Revert "Fixes issue #19823"

This reverts commit 83dad65774.

* Sirryan's suggestion

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-11 15:13:19 -06:00
Adrer
732ef6af73 Do not force push to the wrong branch (#19831) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2022-12-07 21:06:57 -05:00
S34N
d247ebe9c8 new lattice (#19820) 2022-12-03 08:35:39 -05:00
S34N
0d14b178c3 Stethoscopes now highlight the correct vault sound (#19684) 
* stethoscope

* make it work on accessory

* bolditalics
 2022-11-30 15:50:44 -05:00
Henri215
74a5925def A museum's finest: Statues tweaks (#19680) 
* tweaks and adds to statues

* bust removed
 2022-11-26 16:02:52 -05:00
Henri215
dfb85e6460 Preparing for the summer: baseball and dodgeballs! (#19627) 
* welcome to the space jam

* Apply suggestions from code review

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

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

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

* Update code/game/objects/items/sport.dm

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

* Apply suggestions from code review

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

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-25 22:50:17 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
Henri215
a7864e6e9a Clown FIX: Adds the clown recorder (#19710) 
* Adds the clown recorder

* added item action

* Defining cooldown

* cmag define

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

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

* added a second laugh

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-20 23:13:52 +01:00
GDN
ab1e16cd16 Speeds up facehugger egg hatching time (#19622) 
* Speeds up alien egg hatching time

* fixes accidental regression
 2022-11-17 21:04:50 +01:00
S34N
7dcd31990e Ports TCC style windows (#19488) 
* window

* fix plasma window and spawners

* this now works well

* Apply suggestions from code review

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Empty-Commit

* Empty-Commit

* colour tweaks

* further colour tweaks

* last tweak

* edges

* false wall sanity

* Update code/__DEFINES/icon_smoothing.dm

* stealth conflict begone

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-11-16 20:44:51 +00:00
S34N
be91fdc0b8 Wizard den remap (#19575) 
* wiz den refresh

* brass and wood

* final tweaks

* wrong door

* mira
 2022-11-15 18:59:10 -06:00
Christasmurf
9a1b71493a garment bags (#19654) 2022-11-15 17:47:28 -06:00
S34N
4de47b8b58 Refactors table creation (#19441) 
* refactors table creation

* probably works will test later

* tested and tweaked

* words are hard

* Apply suggestions from code review

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

* steel review

* proc breakout

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-15 15:45:55 -06:00
FloFluoro
47c944a1f5 Gives puddle a unique description (#19702) 2022-11-15 19:44:54 +01:00
GDN
fde612de05 Initializes and fixes alien eggs (#19604) 
* Initializes and fixes alien eggs

FIX: Fixes alien eggs not spawning facehuggers when a valid target is in range
FIX: Fixes alien eggs runtiming due to proximity monitor issues
REFACTOR: Refactors Spawn() into addtimer
REFACTOR: New() to initialize()

* standardization and removing unneeded checks

* 515 compliance

* just need PROC_REF for this
 2022-11-10 17:05:22 -06:00
S34N
667dd5d4ac 515 Compatibility (#19636) 
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
 2022-11-08 23:08:40 +00:00
FloFluoro
332fc9193a Fixes description grammar in a few places (#19607) 
* Fixes punctuation on clown box description

* Fixes grammar in a couple places
 2022-11-06 10:43:20 +00:00
S34N
8e475415b1 Stops tree shadows from being part of their hitbox (#19543) 
* unclickable shadows

* readability

* effect

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

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

* order of operations

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-03 18:02:08 +00:00
Henri215
047727d575 safe no longer locked when repaired (#19569) 2022-11-03 17:58:05 +00:00
Bm0n
c4ded4b083 Ports TG direction signs (#19506) 
* signs

* whoops forgot the desc

* evacfix
 2022-11-02 21:03:05 +01:00
matttheficus
09948d54b2 Deputizing the Detective (#19558) 
* Deputizing the Detective

* access giveth

* the gun now hurts you again

as per Hal's comment in discord

* add noir to detdrobe
 2022-10-31 23:15:12 +00:00
Vi3trice
05d93f665a [TM] Port TG Jump Point Search and SSpathfinder (#18984) 
* move along move along

* Update bot.dm

* Diagonals are now more expensive

* Update path.dm

* Update parrot.dm

* Update path.dm

* Tweaks

* Fix cleanbot, add path safety

* Tweaked, added a safety, removed the previous one

* Update medbot.dm

* path.len isn't very safe as a whole, floorbots also had order of operations wrong

* Update medbot.dm

* clings not even once

* Back to the drawing board

* Update path.dm

* Make mules actually clear the drawn path.

* Make bots use step_towards unconditionally instead of flipping between step_to and Move

* Making extra sure the path is cleared. Somehow path was left over.

* Check for length as get_path_to is always true

* This and that
 2022-10-30 15:54:51 +00:00
Vi3trice
03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388) 
* I wasn't done

* nits
 2022-10-28 19:28:23 +02:00
ElorgRHG
574b012505 The (formal CC) blueshield drip is back in town (#19425) 2022-10-23 11:34:45 -05:00
ElorgRHG
1660182d19 Paradise's soul removal part three: lawyers (#19376) 
* Better Call Coderspriters

* This name looks better

* Turns out this is not a copy of an existing jumpsuit

* Minor drask sprite adjustment
 2022-10-21 20:36:36 +02:00
S34N
ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351) 
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
 2022-10-19 16:22:41 -05:00
S34N
96b39e6a28 Removes USSP gateway, adds nothing (#19373) 
* removes ruskie gateway

* mira

* space ruin

* oops make it a proper template

* y e e t
 2022-10-19 21:13:30 +01:00
DevanStrife
bb2e2a9d45 Allows wooden airlocks to be made and removes another text2path function. (#19199) 
* Fixes #18882 and refactors for door assemblies

* Removes text2path, makes wooden airlocks buildable

* Use mineral crafting menu

* Minor oversight

* Comments improvement

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Review suggestions

* Removes unneeded vars

* Fixed tab spacing

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-16 13:04:50 -05:00
Henri215
2280de0b7b Fix #18370 Crayon bedsheets colors are correct now (#19279) 
* correct color for washing machine bedsheet

* var name tweak
 2022-10-16 13:05:11 +02:00
Contrabang
d05543f416 Removes the HOP's second locker from Cyberiad and Kerberos (#19319) 
* goodbye hop2

* nukes the code

* REVERT THAT, WRONG BRANCH

* FUCK

* light and stuff restored
 2022-10-15 13:33:00 -05:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
S34N
db11313caa Fixes draggable bushes, sprite oversight (#19349) 
* no drag the bush, and other tweaks

* im smart
 2022-10-12 20:21:39 +02:00
GDN
313495d36e Puts paper on layer 3 (#19344) 2022-10-12 20:19:07 +02:00