Fox-McCloud
abf409149d
more tweaks and additions
2015-03-26 09:43:13 -04:00
Fox-McCloud
29ab8700e9
adjustments
2015-03-25 23:30:47 -04:00
Fox-McCloud
cedb71e8af
Clarity
2015-03-22 20:18:01 -04:00
Fox-McCloud
d9a257c890
Teleporter Gun, Fixes, and Tweaks
2015-03-22 02:45:02 -04:00
Fox-McCloud
9fef88f347
Implant Cleanup
2015-03-17 06:30:54 -04:00
ZomgPonies
c693be1c57
Merge pull request #548 from tigercat2000/SlimeColorChanger
...
Allows slime people to change color in lobby.
2015-03-11 16:53:29 -04:00
Tigercat2000
b3c5963e3e
Fix weirdness with datacore rendering HAS_SKIN_COLOR races as default
...
color
2015-03-11 17:24:04 +01:00
Tigercat2000
7da4efc494
Fix proc/update_preview_icon as well as ID images for colored slime people
2015-03-11 16:18:34 +01:00
FalseIncarnate
e4a5190188
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:29:07 -04:00
Fox-McCloud
89f2aea30d
Insulated Gloves Fix
2015-03-08 19:12:35 -04:00
Markolie
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
FalseIncarnate
ae13c938c5
Kitchen Overhaul
...
MASSIVE overhaul to the kitchen, should make the chef job more
interesting.
Additions:
- Candy Maker!
- - This machine allows the chef to create a variety of sugary treats
for the crew to enjoy.
- Candy! Lots of candy and this is only the first wave!
- - More candy planned / dreamed for the future
- Candy Moulds
- - Craftable from plastic sheets, also available in the kitchen vendor.
Use these to make different candy types
- - These are returned if you successfully make the candy. Screw up and
the mould is destroyed!
- Cardboard Tubes are now craftable from cardboard
Changes:
- Oven and Grill have been updated to work more in line with the
Microwave and Candy Maker.
- - This means that they are also buildable and upgradeable!
- - Boards for the oven, grill, and candy maker are available from the
circuit printer.
- Many recipes moved from the microwave to the oven and grill.
- - For example, bread is made in the oven, and kabobs are made on the
grill.
- Adds "byproduct" var to recipes
- - Allows for the return of an item in addition to the result,
currently used for candy moulds
Fixes
- Adds Grape Juice reagent.
- - This will fix a runtime and also allow people to actually drink from
the purple cans.
Sprite Credits
- Many thanks to FoS for their sprites for a lot of the candies which I
combined and recolored
- - Also thanks for the new sprites which were included, but not all
used (yet!)
- I also edited and created some horrible sprites for a few candy items
and machine states.
- - Hopefully they will be such an eyesore that a real spriter steps up
and provides something nice.
This overhaul should hopefully add a little variety to the chef role,
while keeping it largely unchanged in terms of difficulty.
2015-03-08 05:09:19 -04:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
Fox-McCloud
7e542873fe
Fixes
2015-03-06 01:13:03 -05:00
ZomgPonies
bc900d678a
Merge pull request #512 from Markolie/master
...
Fix player panel, other fixes
2015-03-04 10:23:36 -05:00
Markolie
6352d2abd9
Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix
2015-03-04 15:09:12 +01:00
ZomgPonies
463204c913
Merge pull request #493 from Markolie/master
...
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
Markolie
1db034a8f8
NanoUI synth airlock update
2015-03-03 18:45:22 +01:00
Markolie
1deef3104e
NanoUI synth airlock controller
2015-03-03 04:51:32 +01:00
SamCroswell
b8a9c902a1
Removes Space Ninjas
2015-03-02 19:05:44 -05:00
ZomgPonies
7799470ca5
Merge pull request #460 from Markolie/master
...
Add bandanas, mask toggling, camo armor jacket, minimum drone/ERT age, turret update, NanoUI update and bugfixes
2015-03-01 12:30:15 -05:00
Fox-McCloud
a9285627ac
Merge remote-tracking branch 'upstream/master' into Cameras
2015-02-28 16:24:03 -05:00
Markolie
3be7fb33e3
Remove duplicate antag obj
2015-02-28 18:15:22 +01:00
Fox-McCloud
62462c876f
Camera Update+Camera Bugs
2015-02-28 04:01:14 -05:00
Markolie
20ac07de8d
Bug fixes
2015-02-27 17:51:57 +01:00
ZomgPonies
2f9b435a0f
Merge pull request #426 from Markolie/master
...
Bug fixes, add atmos watertank
2015-02-26 13:50:37 -05:00
ZomgPonies
5421754760
Merge pull request #418 from Fox-McCloud/Fixes-Genetics
...
Fixes, Genetics, and Balance
2015-02-25 21:56:33 -05:00
Markolie
bfe8a12f1e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
Markolie
6efa3bcdaa
Fix trays (now bags)
2015-02-25 20:42:43 +01:00
ZomgPonies
710d60abda
GC fixes
2015-02-25 10:58:56 -05:00
Fox-McCloud
85d79677b1
Fixes, Genetics, and Balance
2015-02-24 22:58:05 -05:00
Markolie
b44255d250
Bug fixes
2015-02-24 18:57:12 +01:00
Mark van Alphen
8457375738
Merge pull request #391 from ZomgPonies/schedule
...
Goon process scheduler
2015-02-23 19:46:17 +01:00
ZomgPonies
e9288c614b
Merge pull request #388 from Markolie/master
...
Remove click delay, standardize mutations, attack animations, attackby() params addition
2015-02-23 12:47:25 -05:00
Mark van Alphen
130ed7e18c
Merge pull request #381 from Artorp/MimeDoor
...
Gives the mime his very own door and ports /tg/ mime backpack
2015-02-22 22:29:03 +01:00
ZomgPonies
2c50a42ba7
Goon process scheduler
2015-02-22 15:24:46 -05:00
Markolie
377dfe894d
Add attack animations
2015-02-22 21:15:54 +01:00
Artorp
772e931706
Mime backpack: Mandatory & added to supply crates
2015-02-22 20:45:26 +01:00
Markolie
72db213067
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/jobs/job/support.dm
code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407
Standardize mutations
2015-02-22 19:04:43 +01:00
ZomgPonies
1f5ef8d4dd
Merge pull request #380 from Markolie/master
...
Adds celsius to the freezer/heater, crafting update
2015-02-22 08:30:11 -05:00
ZomgPonies
1c1ebc3f3f
Merge pull request #383 from Fox-McCloud/Syndi-Hardsuits
...
Syndi hardsuits
2015-02-22 08:27:38 -05:00
Markolie
efb45ea228
Table crafting refactor
2015-02-22 01:50:57 +01:00
Fox-McCloud
2a1028324c
Thickmaterial Flag
2015-02-21 07:26:25 -05:00
DZD
5e977cbfc9
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-20 19:05:25 -05:00
Markolie
9fedfc7c62
Switch copytext and sanitize proc
2015-02-20 22:17:13 +01:00
Markolie
c89e3ac1eb
Revert "Revert "Emergency communications hotfix""
...
This reverts commit 3ea36839a8
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68
Revert "Revert "Saycode/language/species port from Bay""
...
This reverts commit d54579850c
2015-02-20 17:46:35 +01:00
Fox-McCloud
99d92aea35
Buckshot
2015-02-20 04:46:53 -05:00
DZD
2e848c2c37
Merge remote-tracking branch 'upstream/master' into changeling
2015-02-19 20:59:41 -05:00
