Kelenius
24ef7752cd
Merge branch 'Baystation12/dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
2015-03-28 19:14:59 +03:00
Zuhayr
accbb02b7f
Fixing bugs.
2015-03-28 11:53:39 +10:30
Zuhayr
8f242740a8
Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.
2015-03-28 11:01:11 +10:30
Zuhayr
c5d42f3a4b
More work on severing, improvements to yank-out-object.
2015-03-27 17:51:10 +10:30
Zuhayr
aa6439096c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-26 23:25:26 +10:30
Kelenius
b4b635f32d
Chemistry commit
...
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr
bb2cd41c8c
Fixed up gibbing and organ icons.
2015-03-26 00:40:59 +10:30
Zuhayr
9c92d3851a
Got various kinds of limb loss plus dislocation working.
2015-03-25 23:11:00 +10:30
Zuhayr
97112c8a4c
Replaced display_name with name, worked on severing limbs and damage propagation.
2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c
Preliminary work on converting all monkeys to a human subspecies.
2015-03-25 02:15:45 +10:30
Zuhayr
f017764e64
More work on adjusting/tweaking/fixing the limb port to make it functional.
2015-03-25 00:59:17 +10:30
Zuhayr
3fe4162719
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs
2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73
Beginning to port over new icon update from limbs branch. WIP
2015-03-24 23:48:54 +10:30
PsiOmega
172110b582
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-16 12:37:43 +01:00
Chinsky
f03759a246
Fixes organ bioprinter and the organs. Now less debuggy and less buggy too.
2015-03-13 12:24:27 +03:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
Zuhayr
1984ef6e51
Master into dev-freeze.
2015-03-07 11:33:39 +10:30
Chinsky
f064305a7b
Fixes #8268
2015-03-06 07:11:19 +03:00
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
mwerezak
f7c65b4358
Makes IB no longer contribute to overall damage
2015-02-21 16:56:25 -05:00
Zuhayr
0c206344b6
Master<dev
2015-02-21 19:57:31 +10:30
Zuhayr
2ecd76b07f
Master merge.
2015-02-21 19:51:28 +10:30
Zuhayr
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
mwerezak
6b6fcf81f2
Fixes #8075
2015-02-18 23:55:21 -05:00
mwerezak
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
Zuhayr
9c45f000ec
Merge with dev.
2015-02-16 20:34:07 +10:30
mwerezak
7ccd78baa7
Makes non-edge damage sources less likely to delimb
...
Notably, shotgun slugs are no longer capable of automatic decapitation
2015-02-10 20:26:59 -05:00
Zuhayr
402987edc3
Merge with dev.
2015-02-07 14:44:55 +10:30
Zuhayr
5890fa3c4b
Added plant controller.
2015-02-05 15:53:20 +10:30
GinjaNinja32
1b08463b7e
Antibodies rework.
2015-01-26 05:32:00 +00:00
Chinsky
6e7eb38c5d
Merge pull request #7850 from Baystation12/master
...
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky
0a7185c20a
Fixes #7787
...
Made clean surgical amputation not cause huge wounds. Also moved code around a bit to prevent situations where missing limbs would get wounds (ie hands giving wounds to arms during recursive droplimb).
2015-01-15 18:59:39 +03:00
Zuhayr
8ec096581c
Fix for blood drip overlaying + secret feature
2015-01-15 20:10:32 +10:30
Zuhayr
a01592d5b7
Fixes #7740
2015-01-09 06:25:27 +10:30
Chinsky
d6d1bc15de
Merge pull request #7557 from Zuhayr/dev-freeze
...
Some fixes, siemens coefficient rebalance for species.
2014-12-29 20:56:08 +03:00
Zuhayr
8d7b68d1f5
Fixes double space issue with pain emotes.
2014-12-28 17:19:30 +10:30
mwerezak
fe348726f2
Alien weed regeneration now mends broken bones
...
Also, weed regeneration is reduced unless xenos are resting.
2014-12-28 01:22:26 -05:00
Zuhayr
4b030f30cd
Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs.
2014-12-24 16:06:00 +10:30
Zuhayr
cc00fa3d52
Fixes and tweaks to the previous.
2014-12-23 22:03:02 +10:30
mwerezak
1546d9f293
Fixes #7406
2014-12-13 19:56:11 -05:00
Mloc-Argent
117ca6a135
refactor 'dir = ' into 'set_dir()'
...
This should have little/no gameplay effect right now, just paving the
way for directional lights.
Replaced handle_rotation() on buckly things with this.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-01 13:44:02 +00:00
PsiOmega
c14411d979
Robots can now be rebuilt after destruction.
...
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00
Zuhayr
660b32629e
Merge resolution.
2014-11-19 23:19:33 +10:30
mwerezak
72c6de26a4
Adjusts damaged stance system
2014-11-16 22:12:20 -05:00
mwerezak
9eb6dfdef4
Fixes #7026
...
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
mwerezak
f5ccbe5ba7
Cleans up human stance code
...
Merges leg_tally and can_stand, streamlined the stance checks in organ processing.
Removes half-implemented has_limbs (assigned to 1 but never updated anywhere).
Having only one foot now slows you down.
2014-11-12 22:56:55 -05:00
PsiOmega
6b895e3889
Nasty voices and now noises
...
Some inconsistency when body parts rip. Two sections say voice, one noise.
Going with noise unless it happens to be a use of voice I'm unfamiliar with.
2014-10-31 14:56:09 +01:00
Zuhayr
dcca5ccb6e
Fixes #6763
2014-10-18 07:52:27 +10:30
Zuhayr
37cb78eefa
Fixes #6613 and #6492
2014-10-08 23:10:12 +10:30
Zuhayr
2b3e3667d4
Minor fixes for previous commit, implemented default species languages.
2014-10-07 09:51:48 +10:30
