Fox-McCloud
dec621eefd
Revert "R&D Research Levels Unification"
2015-04-07 01:16:19 -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
jack-fractal
a0be969870
Unifying tech levels
...
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
46f2b24a75
Merge pull request #744 from ZomgPonies/limb
...
Organs/Surgery Fixes
2015-04-06 18:15:56 -04:00
ZomgPonies
85a8a7a35f
Fixes cane speed exploit
2015-04-06 18:09:52 -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
cafbb8035c
microfix
2015-04-05 14:47:51 -04:00
ZomgPonies
91cb7b8b32
Final fixes
2015-04-04 23:30:49 -04:00
VelardAmakar
4dc73ce9af
Added ~15~ 12 new hair options courtesy of Fury McFlurry
2015-04-05 04:20:26 +02:00
ZomgPonies
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
Fox-McCloud
1a81836556
Lethal Brain Damage
2015-04-04 01:51:04 -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
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
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
Tigercat2000
f837edf180
Spaceworm overhaul
2015-04-01 03:13:48 +02: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
7262eace42
Merge pull request #700 from Fox-McCloud/more-goontweaks
...
[Goonchem] Even More Tweaks and Fixes
2015-03-29 20:22:12 -04:00
Fox-McCloud
ae9fc03548
Disables Perma-Spinning (for now)
2015-03-29 19:05:59 -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
fb988a1f36
Revert limb damage not counting towards overall health
2015-03-28 23:58:44 -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
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
Fox-McCloud
a98b79728d
formaldehyde
2015-03-28 06:08:32 -04: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
Fox-McCloud
42d2373c01
Borg Defib Fixes
2015-03-26 01:14:41 -04:00
ZomgPonies
71b2c1621a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into limb
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2015-03-25 15:16:51 -04:00
ZomgPonies
18239091a7
2 new ways of losing limbs!
2015-03-25 15:03:46 -04:00
Fox-McCloud
dbb04f4dbb
[Goonchem] Few Additional Chemicals
2015-03-25 03:50:54 -04:00
ZomgPonies
3665d7fd31
Removing the unneeded limbpain count
2015-03-24 23:02:35 -04:00
ZomgPonies
6770819ae8
Limb overhaul first comit
2015-03-24 08:38:33 -04:00
Iamgoofball
e5264815ee
GOONCHEM
2015-03-24 02:04:47 -07:00
Fox-McCloud
9f59b20303
Merge pull request #624 from Artorp/meat
...
Fixes meat harvesting of some simple_animals
2015-03-22 17:59:48 -04:00
Tigercat2000
7b84658a33
Fix giving things to non-carbons
2015-03-22 19:50:55 +01:00
Artorp
e7434672bc
Fixes meat harvesting of some simple_animals
2015-03-22 05:08:32 +01:00
Fox-McCloud
3d89f8707c
Xeno Space Fix
2015-03-20 16:10:11 -04:00
ZomgPonies
8baa1e4ba9
Merge pull request #595 from Fox-McCloud/Bible-Farting
...
Proper Bible Farting
2015-03-19 01:42:19 -04:00
ZomgPonies
bfb1969279
Merge pull request #592 from Fox-McCloud/mindslave-loyalties
...
Mindslave, Loyalty, and Knockdown fixes.
2015-03-19 01:41:51 -04:00
Fox-McCloud
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
Fox-McCloud
d0a09c8126
Mindslave, Loyalty, and Knockdown fixes.
2015-03-17 14:01:36 -04:00