de86d56285
Deletes leftover code
2019-02-25 21:58:46 -03:00
07b1b319e8
Adds/del some spacings where needed
2019-02-25 21:57:39 -03:00
923e372926
Deletes leftover code
2019-02-25 21:55:52 -03:00
106a918368
Fix typo and adds return
...
Not sure why is needed but just in case
2019-02-13 21:37:04 -03:00
75f49c435c
Fix typo
2019-02-13 21:34:36 -03:00
c72a623ec6
Fixes cookie tray code
...
Makes it kinda shorter, more flexible for future variations of cookies.
2019-02-13 17:37:54 -03:00
9e1833530d
Fixes path and recipes for cookies
...
Now the recipe is different again.
2019-02-13 17:36:23 -03:00
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
a77ca7dd5c
Adds cutter to dinnerware vendor
...
Adds two generic circular cutters to the dinnerware, one extra just in case some idiot loses the first one (probably I'll be that idiot)
2019-02-13 00:22:16 -03:00
5db7dafc38
Adds new circular cutter
...
Needed for the new cookies recipe and maybe future recipes
-----
Fixed, it didn't work before for some reason
2019-02-13 00:16:17 -03:00
4f371cb7c2
Adds trays with cookies
...
Adds two trays, one with x6 cookies and the other with x6 sugar cookies, needed for the new cookies recipe.
2019-02-12 20:28:54 -03:00
ca2fa7c3b3
Adds new circular cutter
...
Needed for the new cookies recipe and maybe future recipes
2019-02-12 20:26:12 -03:00
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
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
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
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
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
82778bd88e
Merge pull request #10872 from AffectedArc07/changelog-button-fix
...
Refactors changelog button
2019-02-11 21:14:17 +08:00
4dda3d4583
Merge pull request #10827 from Shadeykins/GeneticsTraits
...
Removes several round-start disabilities, adds chav.
2019-02-11 20:50:41 +08:00
943a21a776
Merge pull request #10818 from datlo/freegolems
...
Port Mineral golems and Free Golems
2019-02-11 20:37:07 +08:00
9bea70dd49
add comfy coat
2019-02-11 10:56:14 +00:00
d10ac59a02
Merge pull request #10855 from Fox-McCloud/medical-pull-back
...
Pulls Back Some Medical Powercreep
2019-02-11 11:20:05 +08:00
0428b0d9bf
oops
2019-02-10 22:23:09 +00:00
7b5037e16f
Fixes that weird issue
2019-02-10 22:16:02 +00:00
d7b11a51ff
Fixes changelog button
2019-02-10 18:24:04 +00:00
40ba27b871
Adds an admin panel to force unlnik discord accounts
2019-02-10 12:21:30 +00:00
ffa6ed12f3
Merge pull request #10854 from TDSSS/wizardcrash
...
Adds new space ruin, crashed wizard shuttle
2019-02-10 15:48:33 +08:00
a9ce346fd2
Merge pull request #10849 from Fox-McCloud/switch-straps
...
Allows Leather Satchel Strap Switching
2019-02-10 15:46:51 +08:00
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
819042597f
reviver sleep
2019-02-09 13:25:38 -05:00
381a9bbc3e
Merge pull request #10863 from TDSSS/singulo-fix
...
No more pushing singulos
2019-02-09 22:28:36 +08:00
e70dbe1ad5
No more pushing singulos
2019-02-09 14:57:04 +01:00
0c6e1637f0
Fuckin' indents
2019-02-09 10:08:44 +00:00
4d9bc36737
update boards name to para standard
2019-02-09 10:04:21 +00:00
5fa263a7cb
Fixes spacing
2019-02-09 09:53:06 +00:00
11b2cec57d
Allows lesser sanitization
2019-02-09 09:25:50 +00:00
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
42832fb8ee
Revert "Added a configuration option for disabling subsystems by name"
2019-02-09 00:17:40 -05:00
29a3a25ae6
Merge remote-tracking branch 'ParadiseSS13/master' into flatline_partner_fluff
2019-02-08 19:13:51 -08:00
ce02ed22f6
Merge pull request #10740 from AffectedArc07/discord-link-notify
...
Discord linking and roundstart notifications!
2019-02-09 10:55:20 +08:00
a658db8f45
Merge pull request #10781 from MINIMAN10000/subsystem-configuration
...
Added a configuration option for disabling subsystems by name
2019-02-09 10:45:08 +08:00
272a29f249
Never spellcast and drive, kids.
2019-02-09 03:00:25 +01:00
1ac102adec
Pulls Back Some Medical Powercreep
2019-02-08 19:49:56 -05:00
6a59bb52a3
Auto stash before rebase of "ParadiseSS13/master"
2019-02-08 16:26:04 -08:00
b29fed6bf9
Fox Fluff Item Coat
2019-02-08 17:11:59 -05:00
d61fa732f3
Allows Leather Satchel Strap Switching
2019-02-08 16:46:07 -05:00
cbe15e2322
one day while andy was porting a PR
2019-02-08 16:59:38 +00:00
24661d2c44
Merge pull request #10833 from Kyep/ends_geezer_cheat
...
Removes age-based weighting for head/captain job selection
2019-02-08 19:36:56 +08:00
3aeb1d861c
Merge pull request #10831 from Shadeykins/FoodDescriptions
...
Tweaks some food descriptions/casing.
2019-02-08 19:31:34 +08:00
9be0d9a6da
add IS_PLANT tag to wood golem
2019-02-07 23:39:24 +00:00
UmeFuu