Commit Graph

921 Commits

Author SHA1 Message Date
Fox-McCloud 0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud 5bb830771d fix-ups 2015-04-02 19:54:01 -04:00
Fox-McCloud 3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
Fox-McCloud 89ba815dcc Peridaxon fix 2015-03-31 22:38:13 -04:00
Fox-McCloud eaa54f046b Merge remote-tracking branch 'upstream/master' into reagent-touch-rework 2015-03-31 22:31:59 -04:00
Fox-McCloud 5d89a61c1b [Goonchem] Reagent TOUCH Rework 2015-03-31 21:43:09 -04:00
Fox-McCloud 78fccb1e82 fix 2015-03-31 16:57:43 -04:00
Fox-McCloud d87730d7b3 fixes 2015-03-31 03:23:45 -04:00
Fox-McCloud 6cf727d50a SR fixup 2015-03-31 01:11:11 -04:00
Fox-McCloud 595fb2a34c [Goonchem] Pipettes, Fixes, and Tweaks (again) 2015-03-31 00:16:58 -04:00
Fox-McCloud 93cf9de4be [Goonchem] Fixes and Tweaks (again) 2015-03-30 17:30:00 -04:00
Fox-McCloud b2cb7b2923 tweaks again 2015-03-29 20:14:49 -04:00
Fox-McCloud a82399a9e7 Oops 2015-03-29 18:14:11 -04:00
Fox-McCloud d44688f7b9 [Goonchem] Even More Tweaks and Fixes 2015-03-29 17:57:12 -04:00
ZomgPonies 72dea4c27c Merge pull request #695 from SamCroswell/EquiptmentEdits
CentComm Equip Update
2015-03-28 23:25:20 -04:00
ZomgPonies 46aaed0ca9 Merge pull request #694 from TheDZD/minor-fixes
Bugfixes and Custom Food Sanity
2015-03-28 23:24:17 -04:00
Fox-McCloud 796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -04:00
SamCroswell cdf14a47ea CentComm Equip Update
- Death Commandos now actually use the Death Commando frequency.
- Death Commandos have had their medical kits replaced with nanite
hyposprays.
- CentComm officers now spawn with a pulse pistol on their belt as
opposed to the useless base parent egun they got before.
- Remove the NT Rep equip option, as it's already available under the
'as job..' option.
- Merge the Spec Ops and Death Squad officer equip option
- Fixes the madmin malt's hellwater having the wrong ID.
2015-03-28 20:09:49 -04:00
DZD e5b8684cc6 Bugfixes
- Fixes wizard's No Clothes "spell" costing 3 points instead of 2.
- Fixes adminbooze containing a misspelled adminordrazine reagent and
runtiming.
2015-03-28 17:56:56 -04:00
Fox-McCloud 361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Fox-McCloud 6b96276637 hypospray tweaks 2015-03-28 05:03:37 -04:00
Fox-McCloud 1e7c0a4825 fixes 2015-03-28 04:34:48 -04:00
Iamgoofball b58a76e4e0 FUCK 2015-03-27 18:44:42 -07:00
Iamgoofball 4a88b9b3f7 OOP shock and reagents, buffs overdose effects on meth, too many yakkity saxxers 2015-03-27 17:57:11 -07:00
Fox-McCloud a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
ZomgPonies 52ac2d5090 Merge pull request #673 from Fox-McCloud/superhair
[Goonchem] Further Goonchem Changes
2015-03-26 10:53:49 -04:00
Fox-McCloud 56d6d7c9c8 Fixes 2015-03-26 10:27:04 -04:00
Fox-McCloud abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
Fox-McCloud 29ab8700e9 adjustments 2015-03-25 23:30:47 -04:00
Fox-McCloud e0bf463504 [Goonchem] Hairgrownium Change 2015-03-25 18:26:40 -04:00
Fox-McCloud f3dcb69c4b [Goonchem] Sarin Fix 2015-03-25 17:15:49 -04: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 279ea75e62 Touch Ups 2015-03-25 09:12:10 -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
Fox-McCloud 84a659605d Merge pull request #663 from Iamgoofball/muh_doctors_delight
MUH FIXES
2015-03-25 00:18:05 -04:00
Iamgoofball 4f3cc168a4 fixes facid and makes it work, renames bad food 2015-03-24 21:11:18 -07:00
Iamgoofball f165cb7079 muh fixes 2.0 2015-03-24 21:01:02 -07:00
Iamgoofball cea9957062 MUH FIXES 2015-03-24 20:54:59 -07:00
Fox-McCloud b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00
Iamgoofball 19fa3848fb i forgot to remove old cyanide in favor of new cyanide, rippers 2015-03-24 19:19:03 -07:00
Iamgoofball 015c9d4a11 muh spans 2015-03-24 18:20:50 -07:00
Iamgoofball d091031ca6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight
Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
2015-03-24 18:03:11 -07:00
Iamgoofball f5f172652e snowflake code makes me *scream 2015-03-24 17:58:10 -07:00
ZomgPonies 1a09f728ed Merge pull request #644 from Fox-McCloud/Chemistry-Tweaks
Chemistry Balance: Plasma
2015-03-24 20:50:33 -04:00
ZomgPonies 8012022f5d Merge pull request #642 from SamCroswell/HolyWaterBalance
Vampire Holy Water Balancing
2015-03-24 20:50:23 -04:00
Iamgoofball 1278f31661 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2015-03-24 16:35:06 -07:00
Iamgoofball ae2240f513 fuck shit goddamn salglu 2015-03-24 14:03:40 -07:00
Iamgoofball 20afecd650 help this guy died of styptic pills worst coder 2015 2015-03-24 13:02:09 -07:00