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
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
Timothy Teakettle
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Timothy Teakettle
e67fbed1ba
always regenerate icons
2020-09-15 18:37:14 +01:00
Timothy Teakettle
8f6c353ad0
memory leak bad
2020-09-05 21:35:02 +01:00
timothyteakettle
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
timothyteakettle
798e11c407
logic
2020-09-03 22:36:38 +01:00
timothyteakettle
9e2ee588c9
rp prosthetics
2020-09-03 22:05:21 +01:00
timothyteakettle
594fd17f23
test
2020-09-02 15:34:13 +01:00
silicons
77cf561f7f
Merge pull request #13316 from timothyteakettle/ckey-pref
...
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
timothyteakettle
af2c7b295e
ah yes
2020-08-31 02:25:54 +01:00
timothyteakettle
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
silicons
5f7d80eab2
Merge pull request #13281 from Putnam3145/examine-pref
...
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
Timothy Teakettle
b76cf0004b
ui adjustment
2020-08-28 18:34:00 +01:00
Timothy Teakettle
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
Putnam
c7883775fa
Added a pref to see genitals on examine.
2020-08-27 20:22:24 -07:00
Timothy Teakettle
fe25046410
Merge branch 'master' into limbs
2020-08-27 18:06:35 +01:00
silicons
857c581931
Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
...
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
Timothy Teakettle
d877a8c0fb
qol ( #13250 )
2020-08-26 14:14:19 +02:00
timothyteakettle
cd7293a9a2
limbs
2020-08-24 03:19:36 +01:00
Timothy Teakettle
a7a6489f58
loadout loading
2020-08-23 21:48:38 +01:00
silicons
2fa023346a
Merge pull request #13204 from timothyteakettle/donator-items
...
adds three t1 donator items
2020-08-23 05:08:50 -07:00
timothyteakettle
a75d91299a
yep
2020-08-21 23:16:44 +01:00
timothyteakettle
709ddb4e58
test
2020-08-21 03:48:30 +01:00
Timothy Teakettle
264e789c3d
yes
2020-08-18 17:38:20 +01:00
