cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 00:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,292 Commits 29 Branches 2 Tags
3042cfde668ec85df2f85265eb33abcc34bdcc86
Commit Graph

2487 Commits

Author SHA1 Message Date
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
warriorstar-orion
8f8f2ec574 Move reagent documentation to dmdoc. (#19888) 
* Move reagent documentation to dmdoc.

* Cleanups
 2022-12-14 16:17:17 -05:00
PacifistDalek
363464801c Ice Cream Cone Tweaks and New Sprites redux (#19544) 
* Ice Cream, reagent colour, and drink colour update

* re-add accidentally removed drink

* updates for lewcc and sean's review

* a few new names and updates for lewcc's review

* adding S34N's suggestion

* fix merge comflict

* Update code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm

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

* Update code/modules/food_and_drinks/food/foods/desserts.dm

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

* modified things as per Sirryan's review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-12 22:15:43 -05:00
Nathan Winters
638d89711d Cryocell Fixes (#19800) 
* Readability & styling

* Fix cryocells not respecting mob's max health/not ignoring robotic limbs

* Only process occupant if we have power

* Fix cryocell injection cooldown being tracked improperly

* Don't kick them while they're down

* Minor cleanup

* Fix for a hacky fix

* Fix Cryoxadone sometimes using outdated cryocell temperature

* This didn't do anything

* Bitflag ops: readability+styling
 2022-12-12 17:00:37 -05:00
BiancaWilkson
df71074edc hey look, a todo (#19795) 2022-11-29 14:05:48 -05:00
Farie82
cad01936b6 Fix blackpowder reactions (#19709) 2022-11-15 21:40:06 -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
warriorstar-orion
7867c51b52 Replace /proc/num2hex with a much faster macro. (#19600) 2022-11-06 13:11:32 +00:00
Henri215
473a46ff5a Tweaks to autolathe design costs (#19469) 
* first wave of tweaks

* Update code/modules/power/cable.dm

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

* Edan52 review

* missed one

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-10-28 20:05:46 +02: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
Vi3trice
fc7e4847b3 Penlights are universally pens (#19498) 
* You're a pen, you're a light

* Update code/__DEFINES/is_helpers.dm

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

* Might as well remove them

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-10-26 00:12:14 +01:00
Charlie
10a8e8ce85 fix (#19455) 2022-10-21 20:43:23 +01:00
PacifistDalek
9aacf9fead New pumpkinhat and blumpkin hat sprites (#19429) 2022-10-20 20:35:28 +01:00
AVeryReluctantSpider
4c63715566 Update alcohol.dm (#19417) 2022-10-20 20:33:32 +01:00
Charlie
45877bcfa6 fix (#19453) 2022-10-20 15:59:49 +01:00
Farie82
8386e9cdef Fixes waterpacks and friends not GCing (#19269) 
Move nozzles to Initialize
Makes reagents not hold a reference to their atom when they get destroyed
 2022-10-18 22:52:35 -05:00
GDN
e510680a20 adds blackbox logging for revival (#19399) 2022-10-16 12:33:41 +01:00
S34N
edeba92326 Smoke spells readability (#19387) 
* read the smoke

* oops

* contra

* contra

* more tidying

* last one

* Update code/modules/projectiles/projectile/magic.dm

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-15 18:05:55 +02:00
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Nathan Winters
ed39233fe0 Check target fullness before tranfering pill contents (#19321) 2022-10-10 21:24:17 +02:00
Vi3trice
20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
Contrabang
8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024) 
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
 2022-10-06 09:30:33 +01:00
Luc
56a5753d3d Lets you deepfry ice (#19200) 
* Allows for deepfrying ice

* formatting

* Almost forgot this

* Spacing

* Sure, scream too

* Changes oil reaction a bit
- Cooking oil now burns off to an inert version
- The oil deposits yellow oil on the ground too

* FUck I deleted iodine

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Steel review

* review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-10-05 16:57:47 +01:00
Henri215
33d844aba0 Fix #18913 splashing acid on masks no longer displays "Your [null] melts away!" (#19134) 
* doesnt melts away [null] anymore

* edit on line 358 and update to QDEL_NULL

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

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

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

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

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

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

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

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

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-01 16:50:56 +02:00
Qwertytoforty
b3cd14d3ad Reworks nanocalcium injectors to be better. (#19122) 
* Reworks nanocalcium injectors to be not shit

* better

* no s

* better math

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

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

* removes dead, updates percent

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-09-25 17:48:12 +01:00
Henri215
c2aba93317 removed var digestion_ratio (#19114) 2022-09-21 21:50:06 +01:00
Qwertytoforty
065ffff420 Removes radioactive gel from blobs (#19103) 
* Removes radioactive gel

* removes the colour define
 2022-09-21 21:45:05 +01:00
FloFluoro
24895dc6c5 Beer2 no longer instastuns (#19040) 2022-09-17 10:47:40 +01:00
Contrabang
f86f59f177 Revert "Changes SR to not be an instant and unavoidable revival. (#18910)" (#19089) 
This reverts commit 37a3902a83.
 2022-09-17 00:15:21 -05:00
Contrabang
37a3902a83 Changes SR to not be an instant and unavoidable revival. (#18910) 
* SR changes

* they really should explode before anything else

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

this is what i get for ~~stealing~~ reusing code

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

* allows for people with no client to be revived

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-09-16 17:51:46 +01:00
Neth
c5b32512ab Adds Species Drinks (#18734) 
* Merge

* linter be nice

* memes--

* removed force-says and force emotes

* changed Skrell drink

* modified Skrell drink

* review fixes

* changed grey drink

* fixed conditions

* fixed an oopsie

* more fixes

* facepalm
 2022-09-08 22:10:18 +01:00
ParaGitV
e13353e77e Spraytan overdose update (#18788) 
* Spraytan Line Updates

* Punctuation update
 2022-09-01 15:20:24 +01:00
Nathan Winters
417ad89267 Small container transfer rate change improvements (#18780) 
* Avoid extraneous warning on `set_APTFT()` cancel

* Add `set_APTFT()` success feedback message

* Standardize `possible_transfer_amounts`

* Cryptic var names begone

* Unhardcode "It will transfer X units" examine note

* Fix grammar
 2022-09-01 13:31:18 +01:00
LiberatedWaveMan
980bbb489d Adds a New Drink: The Bilkshake (#18932) 
* Update drinks.dmi

* Update alcohol.dm

* Update drinks.dm

* Update drinks.dm

* Update code/modules/reagents/chemistry/recipes/drinks.dm

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

* Squashed commit of the following:

commit c61a500319
Author: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date:   Mon Aug 29 18:05:38 2022 -0400

    Fixes some broken code with a dirt grenade (#18928)

    * i hate old code i hate old code

    * good fix im so good at code

commit 034a6403da
Author: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Date:   Mon Aug 29 23:01:52 2022 +0200

    More positions for body scanners and sleepers when using a wrench (#18815)

    * Adds positions to sleepers and scanners

    * Requested changes

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

commit 7b8f0f3d66
Author: Octus <62493359+Tokorizo@users.noreply.github.com>
Date:   Mon Aug 29 11:17:25 2022 -0500

    The Bartender's shaker now acts like a real shaker! (#18852)

    * SHAKESHAKERHSKAERIT

    * Update code/modules/food_and_drinks/drinks/drinks.dm

    Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

    * maint recommends

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

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

    * STOP SHAKING MF

    * Update code/modules/food_and_drinks/drinks/drinks.dm

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

    Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
    Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit 8a10336780
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:49 2022 +0100

    The headcoder shuffle (#18923)

commit 629c099db7
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Aug 29 16:45:29 2022 +0100

    Refactors status displays (#18811)

    * Refactors status displays

    * biggest commit

commit 5d3310cdef
Author: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Date:   Mon Aug 29 15:39:56 2022 +0100

    Bag icons fixes + Extra bag sprites for vox/grey (#18903)

    * icons

    * dufflehandle

* Update drinks.dmi

* Update code/modules/reagents/chemistry/recipes/drinks.dm

thanks hal

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

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

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-08-31 16:07:49 +01:00
Pidgey
ddfecf85f5 - Converts honeycomb from reagent_containers to type reagent_containers/food/snacks. (#18922) 
- Adds honeycomb as an item that can be picked up in plant bags.
 2022-08-31 13:20:26 +01:00
Adri
9c1618139b Tweaks some NanoMed Plus products, tweaks mannitol and mutadone pills, renames healing patch (#18904) 
* Changes mannitol and mutadone pills

* Renames healing patch to brute patch

* Removes some NanoMed Plus products

* Moves insulin to contraband

* Removes unnecessary capitalization when it comes to reagent bottles

* Reverts mannitol sprite change

* Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category

* Makes syringes lowercase

* Revert "Moves health analyzer upgrades from Nanomed plus to wall nanomed premium category"

This reverts commit 3d586665fe.

* Renames prespawned advanced analyzers
 2022-08-29 11:10:16 +01:00
AffectedArc07
34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
Qwertytoforty
7276267a94 Replaces vox O2 downside with vox only blood. (#18523) 
* Replaces vox brute downside with vox only blood.

* I'm dumb, but at least I am not stupid

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

Co-authored-by: Adri <jozsef.adrienn@gmail.com>

* Add to medbay, cargo, makes blood colour work

* more readable

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* spacing, removes == "Vox"

* test time

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

* makes it work and testing works

Co-authored-by: Adri <jozsef.adrienn@gmail.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-08-11 00:41:17 +01:00
moxian
e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +01:00
Nathan Winters
bec7ebec25 Fix pills checking DRAINABLE on target reagent container (#18657) 2022-08-03 15:34:20 +01:00
Viz
3894832ed8 makes drinks normal (#18658) 2022-08-02 13:47:37 +01:00
PacifistDalek
f3035edb6f Pizza Overhaul 2022 (#18278) 
* wip

* goodbye two pizzas

* commit to pizza time

* pizzaaaaaaaa

* getting there

* hopefully final

* pizza

* do you like me now CL?

* Update code/modules/food_and_drinks/recipes/recipes_oven.dm

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

* fixing suggestions

* Update paradise.dme

* back on track

* removing tablecrafting recipies, switch back to oven recipeis

* remove unused raw pizza sprites

* re-add KalevTait's suggestion

* fix merge conflict

* merge conflict fix i guess???

* i swear if this is still conflicted

* fixing trailing newlines

* moves parent calls

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-07-31 23:23:32 +01:00
PacifistDalek
ba9e89a093 1 down, condiment machine to go (#18592) 2022-07-30 11:51:43 +01:00
Nathan Winters
31e34af4ba Change default dropper transfer rate to 1u (#18568) 
* Change default dropper transfer rate to 1u

* Clarify dropper descriptions

* Fix typo in pipette description

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-29 23:43:21 +01:00
Bm0n
7f83855f49 Maybe actually removes the last of the red crosses but probably not (#18533) 
* this better be the last red crosses

* cmo icon

* just going to fix the cmo icon while i am here

* revents spawner icon changes

* defines blob colours
 2022-07-29 20:11:32 +01:00
Viz
506a2989e0 why is this possible (#18597) 2022-07-28 14:54:18 +01:00
AffectedArc07
2f5cec832d Cleanup redundant machine stuff (#18494) 2022-07-27 21:25:39 +01:00
Charlie
20d484b181 removes garlic juice metacheck (#18439) 2022-07-24 20:19:57 +02:00
LightFire53
18ef75f687 Adds a Gym to BoxStation Dormitories and Removes Exercised Buff/Bath Salts Malus (#18397) 
* DO YOU EVEN LIFT?!!?

* You do not get THOSE gainz from punching

* In which I keep being code baby

* Baby steps

* The final touches

* KERCHOW!

GOTTA CHANNEL YOUR INNER MR. TORGUE WHEN MAKING COMMIT NAMES!

* WHO EVEN NEEDS DOORS ANYWAY

* Sean and Bmon

* THE ANTI-BUFF

* HEY, IT COMPILES

* IT COMPILES BABY!

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-07-23 15:34:01 +01:00
FloFluoro
081221ac28 Fix Grape Granade allowing player to launch infinite items (#18492) 
* Fix Grape Granade allowing player to throw infinite items

* Lower volume to 30
 2022-07-23 15:26:29 +01:00