DeltaFire
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
silicons
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
Timothy Teakettle
a1ccc31877
fuck you travis
2020-10-10 18:05:31 +01:00
DeltaFire
641970f2c0
fixes two typos
...
yeah, I got those two wrong. Not anymore though.
2020-10-10 16:48:25 +02:00
silicons
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
silicons
04db791004
Update human.dm ( #13491 )
2020-10-10 11:57:35 +02:00
Putnam3145
f561389970
Merge pull request #13539 from timothyteakettle/eye-sprites
...
cleans up the eye customization pr
2020-10-08 10:05:30 -07:00
Timothy Teakettle
1fc7d9a21e
cleanup
2020-10-08 17:43:56 +01:00
Timothy Teakettle
d37d7bddae
Update jellypeople.dm
2020-10-08 04:20:42 +01:00
timothyteakettle
9d99061ff5
what the fuck git
2020-10-07 23:40:59 +01:00
Timothy Teakettle
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
Putnam3145
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
silicons
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
silicons
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
silicons
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
DeltaFire
1285280963
empty lastline time
2020-10-06 18:31:52 +02:00
DeltaFire
06cb91ca3d
updates all BODYPART_ORGANIC occurances
...
:)
2020-10-06 18:01:25 +02:00
DeltaFire
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
Timothy Teakettle
05aef528d7
finishing touches
2020-10-04 17:33:46 +01:00
silicons
2e557b2f26
Update simple_animal.dm
2020-10-03 19:51:20 -07:00
silicons
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
Timothy Teakettle
46ebb72905
Merge branch 'master' into loadout-loading
2020-10-04 01:43:17 +01:00
Timothy Teakettle
b48f4b91e6
Merge branch 'master' into eye-sprites
2020-10-04 01:23:03 +01:00
timothyteakettle
dc70d17a1e
customizable eyes
2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
silicons
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
silicons
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
silicons
3e6428567a
Merge pull request #13488 from DeltaFire15/pacifist-parry-fix
...
No harmful parry countering for pacifists.
2020-10-03 14:20:07 -07:00
zerothebigboy
0b8f311e65
a
2020-10-03 03:47:27 -04:00
Putnam
737257552a
Fixes ghost funny + keeps SDGF view fix.
2020-10-02 23:17:12 -07:00
Maxim Nikitin
4b6870ed1b
the fuck
2020-10-02 12:07:09 -04:00
Maxim Nikitin
64b4abca4b
oopsie
2020-10-02 12:05:05 -04:00
Maxim Nikitin
96d46ca0e4
Makes the slimeperson swap-body UI stay open when you switch bodies
2020-10-02 12:03:24 -04:00
timothyteakettle
6533d850c2
compile
2020-10-02 16:42:06 +01:00
timothyteakettle
ab83185ffc
oh no
2020-10-02 16:40:34 +01:00
timothyteakettle
418cd44bbe
SQUISH
2020-10-02 16:31:33 +01:00
timothyteakettle
950cb05617
Merge remote-tracking branch 'upstream/master' into slime-puddle
2020-10-02 15:53:48 +01:00
timothyteakettle
32f32d7e62
compile
2020-10-02 02:33:33 +01:00
timothyteakettle
3fc016e19d
better movement
2020-10-02 02:32:10 +01:00
timothyteakettle
26cfac8988
brrr
2020-10-01 23:57:01 +01:00
timothyteakettle
eb31434b7b
final fix
2020-10-01 23:54:50 +01:00
timothyteakettle
13f1b59133
typo
2020-10-01 23:41:54 +01:00
timothyteakettle
203246ece7
FUCK
2020-10-01 23:40:57 +01:00
timothyteakettle
c602ad1cab
yes
2020-10-01 23:13:53 +01:00
timothyteakettle
121ec996cf
fuck it no resting
2020-10-01 23:09:20 +01:00
Timothy Teakettle
03ad9eb052
experimental test
2020-10-01 22:51:40 +01:00
Timothy Teakettle
b73770c3bc
fuck
2020-10-01 22:03:15 +01:00
Timothy Teakettle
57733473fe
TRAIT SOURCE DEFINE
2020-10-01 21:23:17 +01:00
