Commit Graph

9117 Commits

Author SHA1 Message Date
Fox-McCloud
ddba1a418a [Goonchem] Tweaks 2015-04-04 07:46:00 -04:00
Fox-McCloud
ff5ec1df54 meh 2015-04-03 05:32:53 -04:00
Fox-McCloud
0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
ZomgPonies
d4a658ba48 Merge pull request #715 from Fox-McCloud/few-reagents
[Goonchem] Few New Reagents
2015-04-02 21:32:28 -04:00
Fox-McCloud
5bb830771d fix-ups 2015-04-02 19:54:01 -04:00
ZomgPonies
c3a2916d85 Merge pull request #711 from tigercat2000/Spesswormoverhaul
Spaceworm overhaul (-tg-port)
2015-04-02 14:07:41 -04:00
Fox-McCloud
3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
ZomgPonies
6ad9603d1b Merge pull request #713 from FalseIncarnate/master
Custom Items - Diemos Vezzati
2015-04-01 23:09:12 -04:00
Tigercat2000
e05ff3335f add factions 2015-04-02 03:28:41 +02:00
Fox-McCloud
cd5649e522 Fixes Dead People Vomitting 2015-04-01 19:29:06 -04:00
FalseIncarnate
85d805b2ba Fixes item path
Now properly denotes the blue mask as a fluff item in it's path.
2015-04-01 03:58:52 -04:00
FalseIncarnate
c7d7df0700 Custom Items - Diemos Vezzati
Adds in their custom jumpsuit, armor vest, and sec mask.
2015-04-01 03:44:26 -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
ZomgPonies
8890d6cbea Merge pull request #706 from Fox-McCloud/Dropper
[Goonchem] Pipettes, Fixes, and Tweaks (again)
2015-03-31 22:24:01 -04:00
Fox-McCloud
5d89a61c1b [Goonchem] Reagent TOUCH Rework 2015-03-31 21:43:09 -04:00
Tigercat2000
f837edf180 Spaceworm overhaul 2015-04-01 03:13:48 +02: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
ZomgPonies
451348ab72 Merge pull request #704 from Fox-McCloud/Goontweaksagain
[Goonchem] Fixes and Tweaks (again)
2015-03-30 19:21:45 -04:00
Fox-McCloud
93cf9de4be [Goonchem] Fixes and Tweaks (again) 2015-03-30 17:30:00 -04:00
ZomgPonies
f7fb4f0376 Merge pull request #703 from Svej/ntrephat
Nanotrasen Representative hat
2015-03-30 13:54:26 -04:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
7262eace42 Merge pull request #700 from Fox-McCloud/more-goontweaks
[Goonchem] Even More Tweaks and Fixes
2015-03-29 20:22:12 -04:00
ZomgPonies
48ad4e346b Merge pull request #702 from SamCroswell/DeathCommandoFixes
DS Radio and Rapid Deployment Fixes
2015-03-29 20:22:03 -04:00
Fox-McCloud
b2cb7b2923 tweaks again 2015-03-29 20:14:49 -04:00
SamCroswell
63337efdb8 DS Radio and Rapid Deployment Fix 2015-03-29 19:25:32 -04:00
Fox-McCloud
ae9fc03548 Disables Perma-Spinning (for now) 2015-03-29 19:05:59 -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
Fox-McCloud
27b5d5bb9f Merge pull request #671 from ZomgPonies/limb
Much downgraded Limb Overhaul
2015-03-29 00:44:03 -04:00
ZomgPonies
315d9572be Turn explosion delimbs into amputations due to explosion code overhaul 2015-03-29 00:40:09 -04:00
ZomgPonies
16e3830559 Goodbye limb parent damage overhaul, I barely knew ya. 2015-03-29 00:17:21 -04:00
ZomgPonies
9ecf61f43f Putting back some values for max limb health. 2015-03-29 00:11:26 -04:00
ZomgPonies
035ebc27fb Fix up delimb probabilities to be closer to current 2015-03-29 00:09:02 -04:00
ZomgPonies
fb988a1f36 Revert limb damage not counting towards overall health 2015-03-28 23:58:44 -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
ZomgPonies
7dc292f472 Merge pull request #696 from Fox-McCloud/Goon-tweaks
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 23:23:47 -04:00
Fox-McCloud
d4de91ce15 You Spin Me Right Round 2015-03-28 23:17:00 -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
c2551db339 Diona nymph hivemind fix and custom food
- You can now only put food into custom food, no more "the fire
extinguisher glass shard telescopic baton personal pizza"
- Fixes nymphs being able to learn hivemind languages.
2015-03-28 19:26:53 -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
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
a98b79728d formaldehyde 2015-03-28 06:08:32 -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