cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,288 Commits 26 Branches 2 Tags
12aaa6a93ec2c89bb7e7351fc71bc81ee296e821
Commit Graph

2210 Commits

Author SHA1 Message Date
Markolie
12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01: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
ZomgPonies
fe2ffc16de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-09 23:51:01 -04:00
ZomgPonies
b51850dfdd Blueshield access change 2015-03-09 19:01:42 -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
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
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
Markolie
4fb7a95cff ERT equipment update 2015-03-04 17:16:19 +01:00
Fox-McCloud
a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -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
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
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
Artorp
838b3960cc Fixes taperecorder emag_act() 2015-03-02 17:58:28 +01:00
ZomgPonies
6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup 
Chemistry Cleanup and Fixes
 2015-03-01 23:08:16 -05:00
DZD
69eb5509ec Fixes exchange document objective 2015-03-01 20:35:09 -05:00
Fox-McCloud
9235af2a3d Tweaking 2015-03-01 17:34:03 -05:00
ZomgPonies
f262c04a79 Merge pull request #476 from Markolie/master 
Re-add borer event, adjust vine event weight, fix magistrate headset
 2015-03-01 15:15:12 -05:00
Markolie
3e01615ad7 Re-add borer event, adjust vine event weight, fix magistrate headset, mapfix 2015-03-01 21:04:11 +01: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
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
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
Markolie
6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01: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
Markolie
84a1947c2f Give Blueshield a bowman headset 2015-02-28 20:09:27 +01:00
Mark van Alphen
18692eedfe Merge pull request #450 from ZomgPonies/fixuns 
More fixins and various features
 2015-02-28 17:33:28 +01: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
87c15c4e3f Merge pull request #441 from SamCroswell/master 
Quick-Equip Hotkey Fix, Pulse Rifle Icon Fix
 2015-02-27 20:07:34 -05:00