Commit Graph

71 Commits

Author SHA1 Message Date
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
2019-04-30 19:26:17 +02:00
Arkatos1
3c4bccff18 Adds Floorbot color variants, minor refactors 2019-04-17 19:56:29 +02:00
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
2019-04-01 23:41:32 +02:00
variableundefined
4521747046 Merge pull request #10750 from Nicaragua1/General_Griefsky
General Griefsky
2019-02-16 18:41:35 +08:00
Nicaragua
7cc13f6206 E-dagger version removed, now it's inheriting from secbots. Balance changes
This saved 200lines of code.
2019-02-10 18:56:36 -03:00
Nicaragua
2457fca12a added toy version removed crafting recipe for griefsky aprenttice 2019-01-27 05:16:44 -03:00
Nicaragua
c4e3438833 oops forgot the ) and , . 2019-01-27 02:31:19 -03:00
Nicaragua
15f7f2a125 added crafting recipe for both jgriefsky and griefsky 2019-01-27 02:27:08 -03:00
Fox McCloud
ad6fc45f74 Fixes Null Crafting Recipes 2019-01-22 18:45:54 -05:00
Nicaragua
8175d67b2e honk_bot from V2
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
2019-01-21 12:31:47 -03:00
Citinited
48f37473d7 proper path for built snowmen 2018-12-30 02:25:34 +00:00
Citinited
abe99ba8ad Snowman construction time tweak 2018-12-30 02:15:57 +00:00
Citinited
ccb61518ae You can now build snowmen at Christmastime; removes commented out code 2018-12-30 02:15:05 +00:00
Improvedname
cdc5ae5017 push 2018-12-25 19:50:44 +01:00
Mitchell
0855bd3f82 Lowers craft cost of mat. 2018-12-12 00:32:35 -06:00
Mitchell
54c4325c46 Adds Sushi Mat and Sushi Makiroll
Makes sushi 100% more efficient and viable to make a restaurant out of.
2018-12-07 13:28:10 -06:00
warior4356
9be0a83269 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Drill 2018-11-08 01:58:53 -08:00
datlo
383a331f46 Adds the toxins payload casing to crafting
Adds a new type of bomb payload : The toxins payload. Crafted with a
matter bin, metal, and a remote signaller, it must be loaded with a tank
transfer valve and put into a plasteel bomb casing in order to do
anything. Once the bomb detonates, the toxins payload will open the TTV
(causing an explosion if the mix is correct).

As with syndicate bombs, a bomb with a toxin payload has a minimum 90
second timer, and will beep loudly to warn nearby crew to evacuate the
area.
It can be defused (or accidentally detonated early) in the same way a
syndicate bomb can.

This allows scientists a secure way to test their bombs (less chances of
accidental detonations with this method, although it adds extra steps),
and antagonists a way to craft their own syndicate bomb, which is better
than a simple tank transfer valve if your objective is not killing crew
but making sure a specific area is wiped off the station map with little
to no casualties.
2018-11-06 20:01:19 +00:00
warior4356
0ee51bdcc2 Reverts maps. Fixes conflict. 2018-10-31 19:13:22 -07:00
warior4356
5f74e61731 Map changes, bug fixes 2018-10-29 03:21:52 -07:00
warior4356
13d927c10e Drills implimented 2018-10-29 01:10:10 -07:00
variableundefined
65c246c1c9 TG container_type refactor 2018-10-13 08:20:52 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Fox McCloud
319a6cd500 Removes Explosive Lances 2018-07-03 18:13:51 -04:00
Fox McCloud
b238dfc581 Ports Guillotine 2018-04-27 18:58:23 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
0382afcb33 Ports TG Components 2018-04-21 01:22:50 -04:00
Fox McCloud
b3fa91030b oops 2018-04-15 22:41:42 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox McCloud
5701ea7c75 Ports Nano UI to Subsystems 2018-03-26 23:59:52 -04:00
Fox-McCloud
5f918ceb07 Buffs IEDs 2017-12-05 02:19:17 -05:00
Fox-McCloud
b664f73a68 chemical bombs 2017-06-29 20:02:27 -04:00
tigercat2000
b419782526 Luxury Bluespace Capsule & More
tgstation/tgstation#27881

There is now a second bluespace shelter capsule, which is much more
fancy & expensive. Note, this still does not make them generally available.

Changes Summary:
 - Added "Shelter Beta" - It comes with a built in kitchen, toilet, shower, three
 course meal, and an artifact™️! There are plenty of secrets to
 behold..
 - Added black carpeting. This can be created by the personal crafting
 menu and having any crayon + a carpet with you.
 - Added fancy wooden and fancy black wooden tables. These are craftable
 by hitting wooden table parts with regular and black carpet,
 respectively.
 - You can now unanchor, deconstruct and color shower curtains. Use any kind of
 crayon to color them, and screwdriver to unanchor them. Once they are
 unanchored, you may use wirecutters to change them back into materials-
 All of which are used in a new crafting recipe for creating them.
 - Display cases moderately refactored.
 - Added survival pod windows/windoors for the new luxury pod.
2017-06-07 11:17:44 -07:00
Crazy Lemon
f60dd39a9d Merge pull request #6705 from davipatury/crafting-ui
Personal Crafting Nano-UI-ification
2017-03-21 18:00:34 -07:00
uraniummeltdown
85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04:00
davipatury
72c4a6b7db Personal Crafting nano-ui. 2017-03-07 12:32:32 -03:00
Fox-McCloud
249cd3279c Merge remote-tracking branch 'upstream/master' into stunprod 2017-02-06 05:35:59 -05:00
Fox-McCloud
b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Fox-McCloud
706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud
b31735dec4 Tweaks the Stunprod 2017-01-15 21:49:19 -05:00
Fox-McCloud
f43ad384d1 Fixes ED-209 Crafting Oversight 2016-12-13 09:15:03 -05:00
Krausus
92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Fox-McCloud
e06933ec09 tweakssss 2016-07-26 13:21:06 -04:00
Fox-McCloud
0e64a91891 teleprod 2016-07-25 03:34:06 -04:00
Fox-McCloud
47b15bec0f More Makeshift Items/Weapons 2016-07-25 02:35:01 -04:00
TheDZD
4a818f865c Merge pull request #5159 from Fox-McCloud/bola
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
TheDZD
7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
SamCroswell
cfc15e2dc2 Personal Crafting - What's the point of leaving todos if I don't actually do them? 2016-07-15 16:41:31 -04:00
SamCroswell
0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00