cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
42,942 Commits 26 Branches 2 Tags
de86d562852f79bfe4a26f42dc140c6c411ff310
Commit Graph

19231 Commits

Author SHA1 Message Date
UmeFuu
de86d56285 Deletes leftover code 2019-02-25 21:58:46 -03:00
UmeFuu
07b1b319e8 Adds/del some spacings where needed 2019-02-25 21:57:39 -03:00
UmeFuu
106a918368 Fix typo and adds return 
Not sure why is needed but just in case
 2019-02-13 21:37:04 -03:00
UmeFuu
9e1833530d Fixes path and recipes for cookies 
Now the recipe is different again.
 2019-02-13 17:36:23 -03:00
UmeFuu
2ca07fe803 Fixes code for the cookie dough 
Less code, more convenient. Also now you can cut a chocolate bar into chocolate crumbles.
 2019-02-13 17:34:36 -03:00
UmeFuu
649cf7a63a Adds new type of dough for cookies 
New chemist reaction that creates cookie dough
10u milk + 10u flour + 5u sugar
 2019-02-12 20:24:11 -03:00
UmeFuu
d3fc0a9950 New cookies recipe 
Deletes old one-single cookie recipe and replaces it for a more complex x6 cookies recipe (For both chocolate chips cookies and sugar cookies)
 2019-02-12 20:21:27 -03:00
UmeFuu
3b415b618e Adds code for new cookies recipe 
Adds in special cookies dough, flat cookie dough and the same dough cutted into circles, ready to bake
 2019-02-12 20:19:04 -03:00
UmeFuu
e6eb81de34 Balances cookies reagents 
Chocolate chips cookies now have hot_coco so they actually taste like chocolate and also sugar
Sugar cookies now have 1u of nutriment (they had 3 before) so they're equal the chocolate chips cookies
 2019-02-12 20:16:50 -03:00
variableundefined
051d900ead Merge pull request #10868 from AffectedArc07/ckey-id-lookup 
Adds an admin panel to force unlink discord accounts
 2019-02-11 21:20:39 +08:00
variableundefined
82778bd88e Merge pull request #10872 from AffectedArc07/changelog-button-fix 
Refactors changelog button
 2019-02-11 21:14:17 +08:00
variableundefined
4dda3d4583 Merge pull request #10827 from Shadeykins/GeneticsTraits 
Removes several round-start disabilities, adds chav.
 2019-02-11 20:50:41 +08:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems 
Port Mineral golems and Free Golems
 2019-02-11 20:37:07 +08:00
datlo
9bea70dd49 add comfy coat 2019-02-11 10:56:14 +00:00
AffectedArc07
0428b0d9bf oops 2019-02-10 22:23:09 +00:00
AffectedArc07
7b5037e16f Fixes that weird issue 2019-02-10 22:16:02 +00:00
AffectedArc07
d7b11a51ff Fixes changelog button 2019-02-10 18:24:04 +00:00
AffectedArc07
40ba27b871 Adds an admin panel to force unlnik discord accounts 2019-02-10 12:21:30 +00:00
variableundefined
ffa6ed12f3 Merge pull request #10854 from TDSSS/wizardcrash 
Adds new space ruin, crashed wizard shuttle
 2019-02-10 15:48:33 +08:00
variableundefined
63d2538d66 Merge pull request #10865 from Ty-Omaha/reviver-sleep 
Going to sleep with a reviver no longer heals you
 2019-02-10 08:55:56 +08:00
Ty-Omaha
819042597f reviver sleep 2019-02-09 13:25:38 -05:00
variableundefined
381a9bbc3e Merge pull request #10863 from TDSSS/singulo-fix 
No more pushing singulos
 2019-02-09 22:28:36 +08:00
TDSSS
e70dbe1ad5 No more pushing singulos 2019-02-09 14:57:04 +01:00
AffectedArc07
0c6e1637f0 Fuckin' indents 2019-02-09 10:08:44 +00:00
AffectedArc07
5fa263a7cb Fixes spacing 2019-02-09 09:53:06 +00:00
AffectedArc07
11b2cec57d Allows lesser sanitization 2019-02-09 09:25:50 +00:00
variableundefined
7b5afbadc8 Merge pull request #10838 from Fox-McCloud/defib-nerf 
Reduces Defib Safe Time: Adds Health HUD Defib Indicator
 2019-02-09 13:28:43 +08:00
Gwydion Brain
29a3a25ae6 Merge remote-tracking branch 'ParadiseSS13/master' into flatline_partner_fluff 2019-02-08 19:13:51 -08:00
variableundefined
ce02ed22f6 Merge pull request #10740 from AffectedArc07/discord-link-notify 
Discord linking and roundstart notifications!
 2019-02-09 10:55:20 +08:00
TDSSS
272a29f249 Never spellcast and drive, kids. 2019-02-09 03:00:25 +01:00
Gwydion Brain
6a59bb52a3 Auto stash before rebase of "ParadiseSS13/master" 2019-02-08 16:26:04 -08:00
Fox McCloud
b29fed6bf9 Fox Fluff Item Coat 2019-02-08 17:11:59 -05:00
datlo
cbe15e2322 one day while andy was porting a PR 2019-02-08 16:59:38 +00:00
variableundefined
3aeb1d861c Merge pull request #10831 from Shadeykins/FoodDescriptions 
Tweaks some food descriptions/casing.
 2019-02-08 19:31:34 +08:00
datlo
9be0d9a6da add IS_PLANT tag to wood golem 2019-02-07 23:39:24 +00:00
datlo
9a52dcbec9 Add no_pain to golems 2019-02-07 23:31:09 +00:00
lass9030
03f172eff8 stat, change way drone dies 2019-02-07 20:04:39 +01:00
datlo
0805b89ea7 Update access denied message 
the old message would make you think you need a golem id or somethin
 2019-02-07 14:27:38 +00:00
Fox McCloud
dc09d07d86 Reduces Defib Safe Time: Adds Health HUD Defib Indicator 2019-02-07 00:49:24 -05:00
lass9030
8b666c84c1 fluff suit 2019-02-07 03:52:55 +01:00
Shadeykins
3c2f36759b Readds deaf 2019-02-06 18:50:23 -07:00
Shadeykins
89b9725766 Sorry Citined :( 2019-02-06 18:42:56 -07:00
Shadeykins
1818fd0679 Capital S. 2019-02-05 19:58:40 -07:00
Shadeykins
cda4d7b8d1 Missed some heresy. 2019-02-05 19:57:55 -07:00
Shadeykins
25cf6b60bf donk pocket 2019-02-05 19:57:19 -07:00
Shadeykins
32085e5641 Fixes spaghatt 2019-02-05 19:55:43 -07:00
Shadeykins
e80ea2bbe9 Standardizes casing on drinks. 2019-02-05 19:51:54 -07:00
Shadeykins
a9e7267994 Fixes some casing. 2019-02-05 19:34:35 -07:00
Shadeykins
00f97469ba CS. 2019-02-05 16:32:43 -07:00
Shadeykins
5bda717d37 casing/descriptions 2019-02-05 16:29:41 -07:00