cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 02:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

2395 Commits

Author SHA1 Message Date
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
variableundefined
7c996437ed Merge pull request #16766 from S34NW/spin_the_drinks 
Allows rotating booze and soda dispensers with alt click
 2021-09-25 16:04:29 -05:00
S34N
c0d9b0348b Update code/modules/reagents/chemistry/machinery/chem_dispenser.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-25 21:24:38 +01:00
variableundefined
933f47a15e Merge pull request #16673 from botka4aet/grinder 
Grinder - Use items for full container, not all
 2021-09-23 18:58:54 -05:00
botka4aet
66595eab79 Update reagentgrinder.dm 
For some reasons this check at start cicle is bad. Don't think about it before.
 2021-09-23 18:23:06 +03:00
botka4aet
2c4cf6db3d Syntax fix 2021-09-23 18:12:13 +03:00
SabreML
d4f8a08531 parallel = FALSE 2021-09-22 19:20:39 +01:00
S34NW
9ce920bbbf spinny drink dispensers 2021-09-22 11:56:20 +01:00
SabreML
a0fef16d3e Reagent name capitalisation 2021-09-18 18:11:44 +01:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
Fox McCloud
3e9001f7ee Nerfs Earthsblood 2021-09-15 14:32:10 -04:00
Vi3trice
6657630a95 Update code/modules/reagents/chemistry/reagents/misc.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-12 16:17:08 -04:00
Vi3trice
647f8e41e5 Spraytan gradually makes you darker 2021-09-12 14:22:00 -04:00
botka4aet
d84290b28c All_In_One Grinder 
Now can grind rods
Don't use all grinding stack items
 2021-09-10 17:43:14 +03:00
Sirryan2002
2d3f02e795 Changes Gimlet Recipe + Result Amount 2021-09-04 16:06:34 -04:00
variableundefined
50ec519bcd Merge pull request #16320 from thatdanguy23/newdrinks 
six new drinks
 2021-09-01 19:49:20 -05:00
S34NW
27b88d027b sabre fixes 2021-08-22 20:35:46 +01:00
S34NW
1d702d6250 "in use" drink dispenser sprite 2021-08-22 16:57:39 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW
85c53544dd bodybags, new cutlery, proper booze+beer dispenser, big heater beaker 2021-08-20 12:32:23 +01:00
S34NW
fd5dad6654 old bottles now use the right lids 2021-08-20 12:17:18 +01:00
S34NW
e2227c7833 more chem stuff 2021-08-20 11:44:52 +01:00
S34NW
e390fd9a8b reworked so its just part 1 2021-08-19 22:03:37 +01:00
joep van der velden
7ed779b2e4 Merge remote-tracking branch 'upstream/master' into fireflash-fixes 2021-08-15 10:14:43 +02:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass 
Craftable brass sheets
 2021-08-13 23:40:03 -04:00
variableundefined
d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6 
Fixes 4 runtimes. Linked forum account message is now shown properly
 2021-08-11 16:06:57 -04:00
SabreML
bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
danni boi
c8fdbc32ff Update code/modules/reagents/chemistry/reagents/drink_cold.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:43:34 +01:00
danni boi
90168d8d23 please be nice daddy github, we just want to fix indents 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:35:47 +01:00
danni boi
824b3c4cfc tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:49 +01:00
danni boi
bcee469b58 tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:40 +01:00
danni boi
e633a7a20d tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:31 +01:00
danni boi
c9d5e525b7 tab indents r e e 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 15:27:19 +01:00
variableundefined
fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
SabreML
e0d15d0f79 Trait Define Refactor (#16327) 
* Adminordrazine fix

* Trait Define Refactor

* Fixes 1

* target.status_traits
 2021-07-27 19:30:00 -04:00
variableundefined
4915b39230 Merge pull request #16303 from FlattestGuitar/blur-me-up-scotty 
Stab your eyes out with style
 2021-07-26 21:50:35 -04:00
variableundefined
09a5988ce2 Merge pull request #16147 from S34NW/rad_damage_normalise 
Increases most radiation dose amounts
 2021-07-25 09:15:40 -04:00
Mieszko Jedrzejczak
8f24160317 revert initial eyeblur, add tg's plane master controllers 2021-07-13 18:02:54 +02:00
Fox McCloud
b6b510c2f9 Merge pull request #16284 from AffectedArc07/sorium-ldm-nerf 
Nerfs sorium and LDM
 2021-07-13 00:41:05 -04:00
AffectedArc07
702500af9f Fox fixes. Foxes? 2021-07-09 11:52:13 +01:00
Qwertytoforty
8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224) 
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
 2021-07-08 22:20:32 +01:00
Fox McCloud
f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code 
Removes some oldcode
 2021-07-07 09:57:16 -04:00
danni boi
a514834ab2 Merge branch 'ParadiseSS13:master' into newdrinks 2021-07-07 09:25:46 +01:00
danni-boy
e5249a98ed tested n ready 2021-07-07 09:22:59 +01:00
S34N
22b83565d2 damn rogue characters (#16309) 2021-07-05 18:28:18 +01:00
SabreML
4a3a726c76 Brass Construction 2021-07-03 10:40:03 +01:00
Vallidian
5a0eafb0a8 Adds adminfreeze drink (#15976) 
* Adds adminfreeze drink

Adds a drink similar to Antifreeze called Adminfreeze as a bit of a meme. Requires an upgraded booze machine or a bottle of Nothing, ether from medbay, and some heat to create.
2 counts Vodka, 1 count Nothing, 1 count Ether.

* Removed BWOINK from taste description

Audio cue happens when mixed already.

* Updated adminfreeze drink

Changed sprite to not have the ADMIN on the side.
Changed the recipe to include a more difficult mixture.
1 count neuro-toxin, 1 count toxin special, 1 count fernet, 1 count moonshine, 1 count morphine

Adds a freeze effect and lowers body temp each sip.

Increased the alcohol percentage to 1.5 from .9

* reverted adminfreeze sprite to include ADMIN

After updating the recipe to make it harder to create, and popular opinion. Readded the ADMIN text to fully embrace the meme drink.
 2021-07-02 18:00:32 +01:00
AffectedArc07
b85b672b9d Nerfs sorium and LDM 2021-07-02 13:51:18 +01:00
SabreML
c266b27aed Another small bugfix bundle (#16260) 
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 22:57:27 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00