Commit Graph

15429 Commits

Author SHA1 Message Date
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
25d79df91a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-10 18:29:57 -04:00
FalseIncarnate
1f9c11b194 Kitchen Overhaul Fixes
Fixes all cotton candy flavors/colors utilizing the plain version's
sprite.

Fixes fixing kitchen machines (candy maker, grill, oven, microwave) with
a wrench attempting to unfasten/refasten them to the ground.  You can
only unfasten these machines if they are not broken now.
2015-03-10 01:50:30 -04:00
ZomgPonies
fe2ffc16de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-09 23:51:01 -04:00
Fox-McCloud
7f239d6dbc Merge pull request #551 from ZomgPonies/random
No more randomly weird colored species
2015-03-09 23:26:17 -04:00
ZomgPonies
66dd040130 Gives the ability to stop someone climbing a table 2015-03-09 22:55:30 -04:00
ZomgPonies
d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
ZomgPonies
b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
Tigercat2000
ec8a35d544 Pool fixes, sanity checks.
Updates pool code so that it doesn't affect ghosts, AI eyes, and silicone,
also changes the message to only display on prob(50), to cut down on the
message spam
2015-03-09 19:40:43 +01:00
ZomgPonies
4d1c80b7d9 Merge pull request #535 from FalseIncarnate/master
Kitchen Overhaul
2015-03-09 13:40:49 -04:00
FalseIncarnate
69defb6f29 Kitchen Overhaul Map Edit
Replaces the Cereal Maker with the Candy Maker.
Replaces the old Grill with the new Grill.
Replaces the old Oven with the new Oven.

Also gives the Candy Maker a description that isn't a copy-paste from
the Cereal Maker (whoops).
2015-03-08 21:11:14 -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
SamCroswell
8477d382a7 Merge conflict Fix
Conflicts:
	icons/mob/suit.dmi
2015-03-08 20:38:07 -04:00
FalseIncarnate
3745513c78 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-08 20:33:55 -04:00
Fox-McCloud
7fda1b1fd5 Merge pull request #539 from ZomgPonies/plasma
Plasmamen Softsuit Fixes
2015-03-08 20:31:44 -04:00
FalseIncarnate
e4a5190188 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-08 20:29:07 -04:00
ZomgPonies
355eca1d26 Remove pressure resistance values 2015-03-08 20:26:10 -04:00
Fox-McCloud
89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
ZomgPonies
00902cf5a7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plasma
Conflicts:
	icons/mob/suit.dmi
2015-03-08 17:47:32 -04:00
ZomgPonies
753d23c667 Fix type that screwed with removing plasma suits 2015-03-08 17:43:17 -04:00
ZomgPonies
479fb500ba Some more plasmamen eva suit bugs 2015-03-08 17:34:32 -04:00
SamCroswell
8829a90709 NT Rep + Blueshield Uniform Change 2015-03-08 16:59:01 -04:00
ZomgPonies
e45aea4d2f Added karma jobs to custom softsuits 2015-03-08 16:08:36 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution
Conflicts:
	icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
ZomgPonies
1848926a32 Oops hurr durr 2015-03-08 15:55:01 -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
e82442b831 No special language for now. 2015-03-08 14:37:47 -04: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
SamCroswell
efd546d1e4 Ninja glove icon update, ninja suit toggle function 2015-03-07 19:54:00 -05:00
SamCroswell
723044ebc6 Ninja icons addition, glasses code tweak 2015-03-07 10:31:56 -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
922cd08fd5 Removes 2 lines that do nothing. 2015-03-06 19:56:40 -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