Commit Graph

1495 Commits

Author SHA1 Message Date
ZomgPonies
8baa1e4ba9 Merge pull request #595 from Fox-McCloud/Bible-Farting
Proper Bible Farting
2015-03-19 01:42:19 -04:00
ZomgPonies
bfb1969279 Merge pull request #592 from Fox-McCloud/mindslave-loyalties
Mindslave, Loyalty, and Knockdown fixes.
2015-03-19 01:41:51 -04:00
ZomgPonies
3fc1941a14 Merge pull request #588 from Fox-McCloud/Implants
Implant Cleanup
2015-03-19 01:41:18 -04:00
Fox-McCloud
ba98e33b66 Proper Bible Farting 2015-03-17 19:40:46 -04:00
Fox-McCloud
d0a09c8126 Mindslave, Loyalty, and Knockdown fixes. 2015-03-17 14:01:36 -04:00
ZomgPonies
ad4135e170 Merge pull request #580 from Fox-McCloud/Explosions
Explosion Tweaks and Fixes
2015-03-17 08:22:15 -04:00
Fox-McCloud
9fef88f347 Implant Cleanup 2015-03-17 06:30:54 -04:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04:00
FalseIncarnate
e4a5190188 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-08 20:29:07 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution
Conflicts:
	icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
Markolie
c09c27958a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	maps/cyberiad.dmm
2015-03-08 20:10:49 +01:00
Mark van Alphen
71c344013e Merge pull request #518 from ZomgPonies/plasma
Adds Plasmaman to Karma Shop
2015-03-08 20:02:16 +01:00
ZomgPonies
b573472e55 Adds missing spacesuits to plasmamen 2015-03-08 14:34:39 -04:00
Markolie
80a560d291 Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4 2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8 Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/response_team.dm
	maps/cyberiad.dmm
2015-03-08 18:54:13 +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
SamCroswell
ede55cc8f5 Re-Adds Ninja Gear 2015-03-05 17:17:52 -05:00
Markolie
e30d4cc35d Merge branch 'master' of https://github.com/Markolie/Paradise
Conflicts:
	maps/cyberiad.dmm
2015-03-04 19:34:21 +01:00
Markolie
9cbb93777e ERT armory rework 2015-03-04 19:06:22 +01:00
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
ZomgPonies
3fec57ed8f Merge pull request #494 from Fox-McCloud/Cyborg-Balance
Cyborg Rebalance
2015-03-04 00:15:15 -05: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
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Markolie
a4ab62de58 Fix debraining a severed head 2015-03-03 19:52:10 +01:00
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
DZD
69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
ZomgPonies
2b917b17cd Merge pull request #475 from Markolie/master
Bug fixes galore
2015-03-01 14:41:42 -05:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
ZomgPonies
5a94b87331 Merge pull request #457 from Fox-McCloud/Cameras
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud
a7f631f364 Health and Stack Fixes 2015-03-01 01:07:14 -05:00
ZomgPonies
43783ca583 Merge pull request #452 from Fox-McCloud/RND-Fixes-Balance
RnD Fixes and Tweaks
2015-02-28 22:16:37 -05:00
Fox-McCloud
a9285627ac Merge remote-tracking branch 'upstream/master' into Cameras 2015-02-28 16:24:03 -05:00
ZomgPonies
2a18787c50 Merge pull request #447 from Fox-McCloud/Shields
Telescopic Riot Shield
2015-02-28 09:07:07 -05:00
Fox-McCloud
62462c876f Camera Update+Camera Bugs 2015-02-28 04:01:14 -05:00
Fox-McCloud
923ba5932f RnD Fixes and Tweaks 2015-02-27 17:36:20 -05:00
SamCroswell
75b2220e3e Merge Conflic Fix
Conflicts:
	icons/obj/gun.dmi
2015-02-27 15:52:26 -05:00
Fox-McCloud
30465b03d6 Telescopic Riot Shield 2015-02-27 07:31:03 -05:00
Fox-McCloud
c4950227ca Fixes Watertanks 2015-02-27 01:56:15 -05:00
SamCroswell
5eec718c71 RCD fix
RCDs now take ammo properly.
2015-02-26 22:08:12 -05:00
Markolie
d118e026fa Re-apply kitchen code 2015-02-25 22:14:14 +01:00
Markolie
8e159c51b3 Ensure extinguisher precision works 2015-02-25 21:33:34 +01: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
Markolie
89650e8590 Extinguisher wheelchair update, deathsquad robot fix 2015-02-25 19:56:24 +01:00
Markolie
e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
SamCroswell
8807f13305 ERT - Helmets Change, Cells Capacity Adjustment
The pulse pistol now has 1600 max charge, the Carbine now has a max
charge of 4000.

ERT helmets no longer need to be fastened to their suits to be equipped,
as this was causing bugs.
2015-02-24 14:25:28 -05:00
SamCroswell
c1c6c80eda ERT - Emergency Box, Toolbelt Fix, PDA
The ERT's emergency box now contains:
- A survival knife
- A breath mask
- A full double-extended emergency oxygen tank
- A pair of night vision goggles.
- An inaprov autoinjector.

ERT engineering toolbelts now contain multitools. Whoops.

Add ERT PDAs, at Mark's request.
2015-02-24 13:02:15 -05:00