796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
e2a4ccc8a6
Merge pull request #681 from Fox-McCloud/End-Era
...
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
361554d3b2
Forgot Nicotine in cigs
2015-03-28 05:38:15 -04:00
046096684b
Revert "Change space law iframe wiki link"
2015-03-27 23:53:52 +01:00
a40ee14f2c
Forgot
2015-03-27 07:19:13 -04:00
d1932c0f64
[Goonchem] Transition to Goonchem
2015-03-27 05:41:45 -04:00
acba4c6cf6
Adds construction permits
...
Conflicts:
code/game/gamemodes/objective_items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
code/modules/flufftext/Hallucination.dm
code/modules/paperwork/photography.dm
icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
d90167193a
Merge pull request #670 from ZomgPonies/court
...
Adds gavel and block to magistrate
2015-03-26 11:01:35 -04:00
42d2373c01
Borg Defib Fixes
2015-03-26 01:14:41 -04:00
d604a50dd8
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court
...
Conflicts:
icons/obj/items.dmi
2015-03-25 10:23:14 -04:00
7fdfa9c6a7
Adding gavel and block
2015-03-25 10:22:04 -04:00
4d2a77dbf7
Merge pull request #653 from ZomgPonies/headspear
...
Sticking heads on spears
2015-03-25 09:37:36 -04:00
b3270fe360
Merge pull request #650 from ZomgPonies/beartraps
...
IED fix and trap
2015-03-25 09:37:08 -04:00
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
3e1fac8c94
[Goonchem] FirstAid Transitions
2015-03-25 08:45:36 -04:00
dbb04f4dbb
[Goonchem] Few Additional Chemicals
2015-03-25 03:50:54 -04:00
84a659605d
Merge pull request #663 from Iamgoofball/muh_doctors_delight
...
MUH FIXES
2015-03-25 00:18:05 -04:00
cea9957062
MUH FIXES
2015-03-24 20:54:59 -07:00
f9b3f2b587
Merge pull request #648 from Iamgoofball/muh_doctors_delight
...
GOONCHEM
2015-03-24 21:51:58 -04:00
40b04de8c9
no spinning
2015-03-24 21:42:04 -04:00
8dfaa39ecb
Updates PR with Fox's suggestions
2015-03-24 19:27:05 -04:00
225a448ea7
Sticking heads on spears
2015-03-24 13:42:33 -04:00
3f51d1135a
Re-adds old IED recipe, allows IED -> Beartraps
2015-03-24 09:10:10 -04:00
e5264815ee
GOONCHEM
2015-03-24 02:04:47 -07:00
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
9a19420ac3
Fix spelling error
2015-03-22 15:39:25 +01:00
c40c37390f
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-22 15:29:37 +01:00
ba28d8e5b3
Incendiary Grenade
2015-03-20 17:02:22 -04:00
8baa1e4ba9
Merge pull request #595 from Fox-McCloud/Bible-Farting
...
Proper Bible Farting
2015-03-19 01:42:19 -04:00
bfb1969279
Merge pull request #592 from Fox-McCloud/mindslave-loyalties
...
Mindslave, Loyalty, and Knockdown fixes.
2015-03-19 01:41:51 -04:00
3fc1941a14
Merge pull request #588 from Fox-McCloud/Implants
...
Implant Cleanup
2015-03-19 01:41:18 -04:00
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
d0a09c8126
Mindslave, Loyalty, and Knockdown fixes.
2015-03-17 14:01:36 -04:00
ad4135e170
Merge pull request #580 from Fox-McCloud/Explosions
...
Explosion Tweaks and Fixes
2015-03-17 08:22:15 -04:00
9fef88f347
Implant Cleanup
2015-03-17 06:30:54 -04:00
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
645167b49a
Explosion Tweaks and Fixes
2015-03-15 18:05:13 -04:00
e4a5190188
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2015-03-08 20:29:07 -04:00
5bb63a7f63
Merge Conflict Resolution
...
Conflicts:
icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
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
71c344013e
Merge pull request #518 from ZomgPonies/plasma
...
Adds Plasmaman to Karma Shop
2015-03-08 20:02:16 +01:00
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
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
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
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
ede55cc8f5
Re-Adds Ninja Gear
2015-03-05 17:17:52 -05:00
e30d4cc35d
Merge branch 'master' of https://github.com/Markolie/Paradise
...
Conflicts:
maps/cyberiad.dmm
2015-03-04 19:34:21 +01:00
9cbb93777e
ERT armory rework
2015-03-04 19:06:22 +01:00
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
Fox-McCloud