Commit Graph

22199 Commits

Author SHA1 Message Date
ZomgPonies
5108942ed9 Merge pull request #752 from TheDZD/smoke
Chemistry Smoke Changes
2015-04-08 16:55:03 -04:00
Tigercat2000
54ed51d36b Initial commit for pod tracking device and misc pod equipment datum 2015-04-08 13:21:30 -07:00
Artorp
e1bc56743c Dispose chems directly from chemdispenser
Makes it possible to dispose chemicals directly from the chem dispenser
2015-04-08 15:15:12 +02:00
Tigercat2000
80a67b31aa Make alien nests inform people that their efforts will actually work, for
consistancy with EVERY OTHER BED.
2015-04-08 13:22:06 +02:00
Fox-McCloud
44d8e4beb8 [Goonchem] Acid Rework 2015-04-08 06:42:47 -04:00
Fox-McCloud
4bd18261e6 [Goonchem] Reagent Temperatures 2015-04-08 02:44:50 -04:00
Fox-McCloud
d514b79fc2 Merge pull request #747 from ZomgPonies/multikey
Alt Account checking
2015-04-07 23:15:14 -04:00
Tigercat2000
3eb1339a65 -tg- Dice overhaul 2015-04-08 03:42:44 +02:00
DZD
810d626700 Smoke changes
- Changes smoke so that it immediately affects all mobs in its area of
effect, smoke clouds are purely visual.
- Any mobs in the area of effect of a smoke reaction will be affected by
the smoke's touch reaction, and have all reagents in the smoke container
transferred into them.
- Smoke clouds are no longer opaque.
- Mixing 10u potassium, 10u sugar, and 10u phosphorus or higher will
cause an area of effect with a radius of 3 from the point of reaction.
Any less will have a radius of 2.
- Same with heating 10u smoke powder.
- Smoke powder reaction now only yields 1 powder instead of 3.
- Vent clog event has a radius 3 area of effect.

Fixes and uncommenting

- Uncomments honey turf reaction.
- Uncomments synthflesh turf reaction.
- Adds list for reagents to not copy via smoke (or more specifically,
delete when a smoke reaction happens without copying). This includes
sugar, phosphorus, potassium, and the smoke "reagent" produced in a
smoke reaction.
2015-04-07 20:30:01 -04:00
setheri
705790298a Implemented Wellington's D&D miniatures. 2015-04-08 01:52:22 +02:00
ZomgPonies
c01b66b787 Merge pull request #749 from Fox-McCloud/more-reagents
[Goonchem] More reagents
2015-04-07 15:49:04 -04:00
Tigercat2000
478b6b7a0e Tweak cargo cost a bit 2015-04-07 16:50:51 +02:00
Tigercat2000
71b0fcabba Make guitars actually obtainable, via cargostore, and table crafting 2015-04-07 16:50:10 +02:00
unknown
df0f4791df Adds a guitar! 2015-04-07 13:19:05 +02:00
ZomgPonies
e6b48bb706 Merge pull request #748 from ParadiseSS13/revert-746-write-research-debug
Revert "R&D Research Levels Unification"
2015-04-07 01:30:31 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
Fox-McCloud
ddc3604442 Merge remote-tracking branch 'upstream/master' into more-reagents 2015-04-07 01:15:06 -04:00
Fox-McCloud
68a8340b23 [Goonchem] More Reagents 2015-04-07 01:03:15 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug
R&D Research Levels Unification
2015-04-06 23:28:27 -04:00
ZomgPonies
cb987d3692 Alt Account checking 2015-04-06 23:12:15 -04:00
jack-fractal
5c85b48672 Switching the verb to Debug
Verb should be in Debug
2015-04-06 22:12:18 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
ZomgPonies
807cf437bd Merge pull request #745 from tigercat2000/GODDAMMITTG
Picket sign fixes
2015-04-06 20:39:05 -04:00
Tigercat2000
34d0bdc946 Fix exploit to get around delay, change to notice instead of warning 2015-04-07 02:26:25 +02:00
jack-fractal
1da136bd94 Adding debug command
Adding the ability for Admin's to write out a json file full of debug
info for the Research and Development system.
2015-04-06 19:06:16 -04:00
ZomgPonies
f767cfa460 Merge pull request #741 from SamCroswell/TDomeUpdate
Thunderdome Update
2015-04-06 18:16:30 -04:00
Fox-McCloud
46f2b24a75 Merge pull request #744 from ZomgPonies/limb
Organs/Surgery Fixes
2015-04-06 18:15:56 -04:00
ZomgPonies
81c5451944 Merge pull request #736 from Fox-McCloud/tator-bottle
[Goonchem] Poison Traitor Bottles
2015-04-06 18:13:40 -04:00
ZomgPonies
40cf0fabd2 Merge pull request #740 from tigercat2000/somefixes
Fix pool controller and picket signs
2015-04-06 18:13:28 -04:00
ZomgPonies
85a8a7a35f Fixes cane speed exploit 2015-04-06 18:09:52 -04:00
ZomgPonies
187e0d38f4 Fixing organ data stuff in DB 2015-04-06 17:15:08 -04:00
ZomgPonies
2de3b7148a Fixed being able to switch surgery targets mid-step 2015-04-06 17:05:48 -04:00
SamCroswell
5d1ce61a7d Various Fixes 2015-04-06 12:39:14 -04:00
SamCroswell
69c788449b Thunderdome - Create Teams Button 2015-04-06 11:59:02 -04:00
SamCroswell
e6a6803e24 Thunderdome - Reset Thunderdome Button 2015-04-06 11:22:21 -04:00
Tigercat2000
bbfb2594bc Git being Git disabled picket signs in the compile options, fixed 2015-04-06 13:53:09 +02:00
Tigercat2000
3681914d25 Thiiis is what I get for assuming obj/machinery is anchored by default 2015-04-06 13:52:42 +02:00
Fox-McCloud
e1db537443 [Goonchem] Poison Traitor Bottles 2015-04-05 23:37:41 -04:00
ZomgPonies
a46b227519 Merge pull request #735 from Fox-McCloud/fixups
[Goonchem] Fixups
2015-04-05 23:07:11 -04:00
Fox-McCloud
340451ba5c anti-meta 2015-04-05 22:08:03 -04:00
Fox-McCloud
9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
ZomgPonies
ca7c6f9db7 Merge pull request #734 from tigercat2000/SuicideActs
Adds the most important suicide_act (Toy Katana)
2015-04-05 19:03:35 -04:00
ZomgPonies
2684a2b999 Merge pull request #733 from tigercat2000/StahpSpawningSpessworm
Prevent life reagent from spawning spaceworms
2015-04-05 19:02:55 -04:00
ZomgPonies
430e08574b Merge pull request #729 from SamCroswell/PosterUpdate
Poster update
2015-04-05 19:02:46 -04:00
ZomgPonies
3e5ccfd99e Merge pull request #728 from TheDZD/minor-fixes
Mute Changes
2015-04-05 19:02:34 -04:00
ZomgPonies
e733d1caf0 Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks
[Goonchem] More Additions and Tweaks
2015-04-05 19:02:18 -04:00
ZomgPonies
9dfe308b3d Derp 2015-04-05 18:53:10 -04:00
ZomgPonies
1719df1be2 Fox balancing 2015-04-05 18:51:09 -04:00
SamCroswell
2fc862fb6c Fixes .DME 2015-04-05 18:26:10 -04:00