silicons
c7396632db
Merge pull request #13582 from timothyteakettle/i-hate-mcolor
...
adds advanced colouring mode: allows you to individually colour mutant parts
2020-11-22 13:33:28 -07:00
Timothy Teakettle
185939a09f
stable version
2020-11-08 16:49:49 +00:00
Timothy Teakettle
7a82f53e75
attempte fixes
2020-11-08 16:45:32 +00:00
Timothy Teakettle
d358a170fa
fixes
2020-11-08 14:32:10 +00:00
Timothy Teakettle
48ecffa8f4
Revert "Revert "fixes""
...
This reverts commit 2fb9dc88e7
2020-11-08 12:48:00 +00:00
Timothy Teakettle
2fb9dc88e7
Revert "fixes"
...
This reverts commit a7e0bafde3
2020-11-08 02:23:55 +00:00
Timothy Teakettle
a7e0bafde3
fixes
2020-11-08 01:46:43 +00:00
Timothy Teakettle
022f996cfa
better fix
2020-11-05 17:28:32 +00:00
timothyteakettle
8126eb5a12
fixes a lot of things
2020-11-02 23:07:27 +00:00
Timothy Teakettle
22823f629d
an actual fix
2020-11-01 20:40:08 +00:00
Timothy Teakettle
f4f322dd0e
better fix
2020-10-30 19:39:43 +00:00
timothyteakettle
a987420d22
fix for mam markings
2020-10-27 21:40:07 +00:00
timothyteakettle
a9f2b86da9
tonne of fixes
2020-10-27 21:32:08 +00:00
timothyteakettle
2275dde281
prior fix didnt work this does
2020-10-27 00:15:58 +00:00
timothyteakettle
79e81a455a
old fix
2020-10-26 23:52:20 +00:00
Timothy Teakettle
f468e4940a
typo
2020-10-26 20:33:46 +00:00
Timothy Teakettle
4e6146898c
fixes/config edits
2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f
config values
2020-10-26 20:27:02 +00:00
Timothy Teakettle
38313fa362
i hate dwarves
2020-10-26 17:50:21 +00:00
Timothy Teakettle
cfefe99d35
okay so what if its not quirks
2020-10-26 17:45:43 +00:00
Timothy Teakettle
f778ec0199
yeah lets maybe render stuff
2020-10-22 01:33:53 +01:00
timothyteakettle
a9a4d00171
second qol
2020-10-22 00:08:33 +01:00
timothyteakettle
4a3afae9d1
WHAT IF WE FIXED EVERYTHING IN ONE COMMIT
2020-10-21 23:59:15 +01:00
Timothy Teakettle
ab35f8cf66
include literally everything
2020-10-21 15:47:42 +01:00
Timothy Teakettle
87387f45d1
fixes
2020-10-17 23:32:08 +01:00
Timothy Teakettle
5e780064c1
fixes and a toggle
2020-10-17 19:47:46 +01:00
timothyteakettle
04e1d9fc39
more fixes
2020-10-17 03:42:14 +01:00
timothyteakettle
d5a1834788
more fixes
2020-10-17 01:40:02 +01:00
timothyteakettle
4f5465c39e
fixes
2020-10-17 01:00:04 +01:00
Timothy Teakettle
2c6e8fd87d
what if color was cool
2020-10-16 22:28:00 +01:00
silicons
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
Tupinambis
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
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
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
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07: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
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
Timothy Teakettle
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
silicons
6094cd7191
Merge pull request #13508 from DeltaFire15/robotic-fixes
...
bodypart fixes - robotic bodypart & digitigrade edition
2020-10-03 14:32:45 -07:00
DeltaFire
79af981467
fixes some fun limb code
2020-10-03 21:51:49 +02:00
Tupinambis
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
Tupinambis
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
Timothy Teakettle
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
silicons
fba8bfbf4f
Merge pull request #13467 from Putnam3145/past-me-idiot
...
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
Putnam
c644495e5e
dodgin bullets
2020-09-29 21:07:41 -07:00
timothyteakettle
396872e98e
show the right thing
2020-09-28 23:21:34 +01:00
