7200f2b004
Update emote.dm
2020-10-10 02:47:28 -07:00
f561389970
Merge pull request #13539 from timothyteakettle/eye-sprites
...
cleans up the eye customization pr
2020-10-08 10:05:30 -07:00
1fc7d9a21e
cleanup
2020-10-08 17:43:56 +01:00
d37d7bddae
Update jellypeople.dm
2020-10-08 04:20:42 +01:00
9d99061ff5
what the fuck git
2020-10-07 23:40:59 +01:00
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
3edc471012
Merge pull request #13517 from Citadel-Station-13/silicons-patch-11
...
"are you sure we should remove mobs from the immunity typecache" v2: electric boogaloo
2020-10-07 15:07:52 -07:00
8e83dcd697
event permissions
2020-10-07 14:43:53 -07:00
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
db6e5d86d8
Merge pull request #13504 from zeroisthebiggay/yeah
...
buffs stands in general, adds gravitokinetic stand type from tg, fixes broken protector shield
2020-10-06 17:03:16 -07:00
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
03a47bda6d
Merge pull request #13252 from timothyteakettle/loadout-loading
...
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -07:00
1285280963
empty lastline time
2020-10-06 18:31:52 +02:00
06cb91ca3d
updates all BODYPART_ORGANIC occurances
...
:)
2020-10-06 18:01:25 +02:00
4146566af0
hoo boy
...
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
2020-10-06 17:34:13 +02:00
7c07863179
fix
2020-10-05 13:29:53 -07:00
05aef528d7
finishing touches
2020-10-04 17:33:46 +01:00
2e557b2f26
Update simple_animal.dm
2020-10-03 19:51:20 -07:00
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
46ebb72905
Merge branch 'master' into loadout-loading
2020-10-04 01:43:17 +01:00
b48f4b91e6
Merge branch 'master' into eye-sprites
2020-10-04 01:23:03 +01:00
dc70d17a1e
customizable eyes
2020-10-04 01:19:29 +01:00
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
d5ff552f3e
Merge pull request #13494 from monster860/patch-4
...
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-03 14:22:11 -07:00
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
3e6428567a
Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
...
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
0b8f311e65
a
2020-10-03 03:47:27 -04:00
737257552a
Fixes ghost funny + keeps SDGF view fix.
2020-10-02 23:17:12 -07:00
1620e3887c
Merge branch 'master' into species-refactor
2020-10-02 17:19:48 -05:00
bdd121cd81
Prep Work
2020-10-02 17:17:50 -05:00
4b6870ed1b
the fuck
2020-10-02 12:07:09 -04:00
64b4abca4b
oopsie
2020-10-02 12:05:05 -04:00
96d46ca0e4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-02 12:03:24 -04:00
6533d850c2
compile
2020-10-02 16:42:06 +01:00
ab83185ffc
oh no
2020-10-02 16:40:34 +01:00
418cd44bbe
SQUISH
2020-10-02 16:31:33 +01:00
950cb05617
Merge remote-tracking branch 'upstream/master' into slime-puddle
2020-10-02 15:53:48 +01:00
32f32d7e62
compile
2020-10-02 02:33:33 +01:00
3fc016e19d
better movement
2020-10-02 02:32:10 +01:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
26cfac8988
brrr
2020-10-01 23:57:01 +01:00
eb31434b7b
final fix
2020-10-01 23:54:50 +01:00
13f1b59133
typo
2020-10-01 23:41:54 +01:00
203246ece7
FUCK
2020-10-01 23:40:57 +01:00
c602ad1cab
yes
2020-10-01 23:13:53 +01:00
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
121ec996cf
fuck it no resting
2020-10-01 23:09:20 +01:00
03ad9eb052
experimental test
2020-10-01 22:51:40 +01:00
b73770c3bc
fuck
2020-10-01 22:03:15 +01:00
57733473fe
TRAIT SOURCE DEFINE
2020-10-01 21:23:17 +01:00
silicons