cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-22 12:31:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
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
Fox-McCloud
b3e81dc09a Artvend Mapping 2015-03-08 14:00:10 -04: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
1b1c460d7a Merge pull request #527 from tigercat2000/Poolmagic 
Adds a new machine: The Pool Controller
 2015-03-08 13:25:17 -04:00
ZomgPonies
9a21ce5fef Merge pull request #529 from Fox-McCloud/Crayons 
Crayons and Gloves
 2015-03-08 13:24:05 -04:00
ZomgPonies
10eabef051 Merge pull request #531 from Fox-McCloud/ArtVend 
Art vend
 2015-03-08 13:23:43 -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
a3bfa5300b ArtVend 2015-03-07 03:26:45 -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
Tigercat2000
7c7c54a795 Update Pool Controller to fox's recommendations 2015-03-06 23:07:08 +01:00
Fox-McCloud
6eac47a00a Merge pull request #519 from ZomgPonies/superhero 
Superhero update
 2015-03-06 15:28:17 -05:00
ZomgPonies
8c34221110 Merge pull request #523 from Fox-McCloud/Syndi-Channel-Fix 
Fixes
 2015-03-06 12:55:24 -05:00
ZomgPonies
17a9e38439 Merge pull request #511 from Fox-McCloud/Life-Proc-Work 
Life Proc Changes--Cold Space and and Temp Handling
 2015-03-06 12:54:42 -05:00
Tigercat2000
59ec3b8df7 Change process system in accordance to MarkvA's line comments 2015-03-06 18:52:10 +01:00
Tigercat2000
5262b56abd Hot mode now spawns mist on the pool as a warning 2015-03-06 18:32:36 +01:00
Tigercat2000
0d752ec1ec Merge branch 'master' of github.com:ParadiseSS13/Paradise into Poolmagic 2015-03-06 17:21:25 +01:00
Tigercat2000
8b66dfc063 Final pool controller commit, Warm and Cool modes added, Hot and Cold 
moved to emag-only.
 2015-03-06 17:19:51 +01:00
Fox-McCloud
438efadc7e Cryo Fixes 2015-03-06 02:35:36 -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
Tigercat2000
f58d3a9b75 Poolcontroller update-fix 2015-03-05 22:46:36 +01:00
Tigercat2000
abd25690e1 Adds pool controller 2015-03-05 22:24:36 +01:00
ZomgPonies
06ee04e839 Superhero update 2015-03-05 15:53:15 -05:00
ZomgPonies
eaf6e71988 Fix Spacepod infinite explosion bug 2015-03-05 13:40:27 -05:00
Markolie
6ca0f0fcc6 Allow ERT gender selection, ERT jumpsuit revert 2015-03-05 18:48:24 +01:00
Markolie
495b02864a Actually equip the ERT jumpsuits 2015-03-04 19:47:20 +01: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
Markolie
9c54d2feaa Central Command access rework 2015-03-04 16:36:17 +01:00
ZomgPonies
0e4c12b3cc Merge pull request #498 from tigercat2000/Gibberanim 
Adds an 'animation' for feeding people into the gibber.
 2015-03-04 10:25:55 -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
Markolie
3a196c1812 Re-add door forcing sound 2015-03-04 14:30:33 +01:00
Fox-McCloud
a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
Fox-McCloud
5cad8fe41e Merge pull request #500 from ZomgPonies/blood 
Proper colored blood
 2015-03-04 00:24:53 -05: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
ZomgPonies
10ee512d22 Merge pull request #492 from SamCroswell/dave-NinjaDev 
Removes Space Ninjas
 2015-03-03 21:26:16 -05:00
Markolie
3497d4ba9e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-03-03 22:58:41 +01:00
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
Fox-McCloud
54385f0197 Merge pull request #491 from Artorp/CargoContents 
Gives cargo computers a contents link
 2015-03-03 16:38:18 -05:00
Fox-McCloud
253563e211 Energy Tweaks 2015-03-03 16:00:07 -05:00
Markolie
a497411d89 Fix portable turret runtime, fix AI meter examine 2015-03-03 20:19:48 +01:00