Commit Graph

3982 Commits

Author SHA1 Message Date
ZomgPonies
0ee915abeb Merge pull request #602 from Fox-McCloud/Recursive-Explosions
Removes Recursive Explosions
2015-03-20 02:58:54 -04:00
Fox-McCloud
b97d79fa02 Merge pull request #599 from TheDZD/plasma-structures
Removes plasma mineral doors burning
2015-03-19 23:36:46 -04:00
Fox-McCloud
38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
ZomgPonies
8baa1e4ba9 Merge pull request #595 from Fox-McCloud/Bible-Farting
Proper Bible Farting
2015-03-19 01:42:19 -04:00
ZomgPonies
ab963bdb10 Merge pull request #594 from Fox-McCloud/Overcharged-Flash
Overcharged Flash
2015-03-19 01:42:03 -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
DZD
f81848033f Comments out plasma mineral doors burning 2015-03-18 22:15:41 -04:00
Fox-McCloud
ba98e33b66 Proper Bible Farting 2015-03-17 19:40:46 -04:00
Markolie
74724e6936 Radio uplink refund fix 2015-03-17 22:54:21 +01:00
Fox-McCloud
2b33c18bfe Overcharged Flash 2015-03-17 17:10:24 -04:00
Fox-McCloud
d0a09c8126 Mindslave, Loyalty, and Knockdown fixes. 2015-03-17 14:01:36 -04:00
Markolie
747c2f9a57 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/turfs/simulated/floor.dm
2015-03-17 16:18:42 +01:00
Markolie
12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01:00
ZomgPonies
09d8e839ef Merge pull request #582 from Fox-McCloud/Escape-Pods
Escape Pod Fixes and Tweaks
2015-03-17 08:29:40 -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
23bae14e9c Fix monkeys picking up intercoms 2015-03-16 18:52:33 +01:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
604b4bb28a Escape Pod Fixes 2015-03-16 02:18:35 -04:00
Fox-McCloud
645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04:00
Fox-McCloud
a31cdc9091 Merge pull request #572 from SamCroswell/NinjaDev
Ninja Restructure
2015-03-15 16:58:41 -04:00
SamCroswell
62ae69c816 Ninja File Structure Rework
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.

Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
Mark van Alphen
bee7dc659b Merge pull request #550 from ZomgPonies/master
Blueshield Balance Changes
2015-03-11 14:26:14 +01:00
Mark van Alphen
9fa5faafab Merge pull request #552 from ZomgPonies/table
Balancing out tableclimbing
2015-03-11 14:26:04 +01:00
ZomgPonies
fe2ffc16de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-09 23:51:01 -04:00
ZomgPonies
66dd040130 Gives the ability to stop someone climbing a table 2015-03-09 22:55:30 -04:00
ZomgPonies
b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
ZomgPonies
4d1c80b7d9 Merge pull request #535 from FalseIncarnate/master
Kitchen Overhaul
2015-03-09 13:40:49 -04:00
SamCroswell
65b530fbe6 Locker Fix - Part Zwei 2015-03-08 21:01:01 -04:00
SamCroswell
03a13fca3a Locker Fix 2015-03-08 20:53:47 -04: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
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
ZomgPonies
9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons
Crayons and Gloves
2015-03-08 13:24:05 -04:00
ZomgPonies
9e57d2424f Merge pull request #528 from TheDZD/nano_pai
NanoUI pAIs
2015-03-08 13:23:05 -04: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
SamCroswell
9b87487783 Minor Fixes 2015-03-07 23:13:00 -05:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
DZD
d2d0627d43 NanoUI pAIs 2015-03-06 18:34:45 -05:00
ZomgPonies
8c34221110 Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix
Fixes
2015-03-06 12:55:24 -05:00
Fox-McCloud
7e542873fe Fixes 2015-03-06 01:13:03 -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