cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,441 Commits 28 Branches 2 Tags
dbb04f4dbbd68969a7cbe9c9f264c8b07ad76ead
Commit Graph

2242 Commits

Author SHA1 Message Date
Fox-McCloud
dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00
Fox-McCloud
84a659605d Merge pull request #663 from Iamgoofball/muh_doctors_delight 
MUH FIXES
 2015-03-25 00:18:05 -04:00
Iamgoofball
cea9957062 MUH FIXES 2015-03-24 20:54:59 -07:00
ZomgPonies
f9b3f2b587 Merge pull request #648 from Iamgoofball/muh_doctors_delight 
GOONCHEM
 2015-03-24 21:51:58 -04:00
ZomgPonies
ee973c5f1a Merge pull request #646 from Fox-McCloud/Object-Spinning 
Thrown Object Spinning
 2015-03-24 21:49:57 -04:00
Iamgoofball
617f2b8aec guys, the medical analyzer upgrade, go get it 2015-03-24 18:44:39 -07:00
Fox-McCloud
40b04de8c9 no spinning 2015-03-24 21:42:04 -04:00
Iamgoofball
015c9d4a11 muh spans 2015-03-24 18:20:50 -07:00
Iamgoofball
44d9ef204e snowflake code makes me *scream V2 2015-03-24 17:59:07 -07:00
Iamgoofball
f5f172652e snowflake code makes me *scream 2015-03-24 17:58:10 -07:00
Iamgoofball
1278f31661 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2015-03-24 16:35:06 -07:00
Fox-McCloud
6b543f37ff Merge remote-tracking branch 'upstream/master' into Health-Analyzer 2015-03-24 15:53:37 -04:00
ZomgPonies
3db10c7c37 Merge pull request #635 from Fox-McCloud/Taperecorder 
Taperecorder Rework
 2015-03-24 08:01:16 -04:00
Iamgoofball
e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Fox-McCloud
69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04:00
Mark van Alphen
98f06c5d4d Merge pull request #627 from tigercat2000/ChaplainNERRFSS 
Allow Chaplain to bless beakers by inserting them into his bible
 2015-03-23 15:38:40 +01:00
Fox-McCloud
aa5cdae070 Taperecorder Rework 2015-03-23 05:45:15 -04:00
Tigercat2000
9a19420ac3 Fix spelling error 2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f Allow Chaplain to bless beakers by inserting them into his bible 2015-03-22 15:29:37 +01:00
Fox-McCloud
ba28d8e5b3 Incendiary Grenade 2015-03-20 17:02:22 -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
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
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
645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04: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