Commit Graph

3054 Commits

Author SHA1 Message Date
Tigercat2000 5253f58700 betterer sprites, bob animation 2015-03-28 03:50:23 +01:00
Chinsky e364c3b560 Cryo will now show occupant inside on sprite. 2015-03-28 01:48:18 +01:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Tigercat2000 18072a8539 Replace other instances of item/blueprint 2015-03-26 18:55:31 +01:00
ZomgPonies 17dfe4e481 Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
2015-03-25 09:33:21 -04:00
Fox-McCloud 3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Fox-McCloud dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00
Iamgoofball f165cb7079 muh fixes 2.0 2015-03-24 21:01:02 -07:00
Fox-McCloud 6b543f37ff Merge remote-tracking branch 'upstream/master' into Health-Analyzer 2015-03-24 15:53:37 -04:00
Tigercat2000 ca4b092445 Whoops, left in an old reference, didn't update parts, fixes #463 2015-03-24 12:56:59 +01:00
Fox-McCloud 69bc15604d Health Analyzer Upgrading 2015-03-23 19:44:06 -04:00
ZomgPonies 56de2ab011 Merge pull request #631 from tigercat2000/SpessPodUpdates
Massive spacepod construction overhaul by /VG/
2015-03-23 16:53:13 -04:00
Tigercat2000 76ffbbfd59 Massive spacepod construction overhaul by /VG/ 2015-03-23 02:36:49 +01:00
Fox-McCloud b444ec3f09 Merge pull request #619 from TheDZD/applepocalypse-prevention
Applepocalypse Prevention
2015-03-22 17:58:19 -04:00
DZD bd863d0d89 Applepocalypse Prevention
- Nutriment is no longer insanely good for increasing a hydroponics
tray's yield_mod, it's now marginally worse than robust harvest, which
is marginally more difficult to make.
- yield_mod is now capped at 100, no more getting 2000+ items out of one
harvest.
2015-03-21 15:23:28 -04:00
Markolie 24626bc081 Testing lab changes 2015-03-21 16:18:42 +01:00
Markolie 3c8ca1fafd Fix admin radio chat preference applying to non-admins 2015-03-21 15:38:20 +01:00
Artorp fc45243f8a Bugfixes
- Disables random events by default, requires config.txt to enable
random events
- Makes portable turrets respect its preset anchored value
- Gives flamethrower a real category
2015-03-21 13:39:00 +01:00
Fox-McCloud 9749c04d15 Merge pull request #605 from FalseIncarnate/master
Grape Juice
2015-03-21 01:58:02 -04:00
ZomgPonies 0ee915abeb Merge pull request #602 from Fox-McCloud/Recursive-Explosions
Removes Recursive Explosions
2015-03-20 02:58:54 -04:00
FalseIncarnate 0541f7c3c8 Grape Juice
Re-adds grape juice to the game.
- Adds Grapel Juice to the vending machine.
- Get your purple cans for 20 credits.
- Adds Grape Juice to the bar's soda fountain.
- Adds the ability to juice grapes into Grape Juice.

This makes purple candies possible, and who doesn't want to fill their
cup with PURPLE DRANK.
2015-03-20 00:24:23 -04:00
Fox-McCloud 38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
Tigercat2000 1191fb912e Gibber Refactor/Mousedrop/LayerHandling/AutogibberFix 2015-03-19 03:17:38 +01:00
Markolie 83e2a4cea1 Cryopod update 2015-03-17 16:33:09 +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
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 d266436143 Merge pull request #570 from tigercat2000/NanoUIPool
NanoUI for Pool-Controller! (never again)
2015-03-15 16:59:30 -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
Tigercat2000 e0f2c1ac78 Fix according to MarkvA's comments 2015-03-12 21:55:20 +01:00
Tigercat2000 811bf57d22 NanoUI for Pool-Controller! (never again) 2015-03-12 19:51:27 +01:00
ZomgPonies f7c1fe8229 Hurr durr derpydidurr 2015-03-11 23:35:15 -04:00
ZomgPonies adb54f4a06 Cryopod fixes 2015-03-11 18:08:01 -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
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
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
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
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
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 a3bfa5300b ArtVend 2015-03-07 03:26:45 -05:00
Fox-McCloud 4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -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
Tigercat2000 59ec3b8df7 Change process system in accordance to MarkvA's line comments 2015-03-06 18:52:10 +01:00