silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
Timothy Teakettle
f950424785
more text changes
2020-11-10 16:00:19 +00:00
Timothy Teakettle
2115e14d22
typo
2020-11-10 15:48:49 +00:00
Timothy Teakettle
09035855e7
some qol
2020-11-10 15:48:11 +00:00
Timothy Teakettle
4db4fcb16e
Update new_player.dm
2020-11-08 18:18:33 +00:00
Timothy Teakettle
c90b197b00
different note
2020-11-08 17:51:51 +00:00
Timothy Teakettle
38e60025cf
heehoo typo
2020-11-08 17:33:18 +00:00
Timothy Teakettle
29f1132d36
Update new_player.dm
2020-11-08 02:25:53 +00:00
Timothy Teakettle
5eaac21127
okay
2020-11-07 19:44:06 +00:00
Timothy Teakettle
68c0caf4fa
better verification
2020-11-07 19:32:23 +00:00
Timothy Teakettle
82e561675c
yes
2020-11-06 21:47:22 +00:00
Timothy Teakettle
e2ca7164b9
age verification
2020-11-06 21:00:14 +00:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +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
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
0c99b53c05
eyes
2020-10-03 23:22:53 +01: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
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
Tupinambis
5d4429a61a
You can now have none
2020-10-01 12:57:07 -05:00
Tupinambis
0bb889932d
Completed!
2020-09-30 19:05:56 -05:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
Timothy Teakettle
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
Artur
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
Timothy Teakettle
0d8374a328
organic rendering
2020-09-16 05:09:21 +01:00
Timothy Teakettle
8f6c353ad0
memory leak bad
2020-09-05 21:35:02 +01:00
timothyteakettle
cdaef63fa1
sorry travis
2020-09-03 23:07:19 +01:00
timothyteakettle
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
timothyteakettle
4f82f063db
dummies
2020-09-03 22:09:50 +01:00
timothyteakettle
9e2ee588c9
rp prosthetics
2020-09-03 22:05:21 +01:00
Artur
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
Timothy Teakettle
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
Timothy Teakettle
be22486913
this hurt to do manually
2020-08-24 19:55:10 +01:00
timothyteakettle
cd7293a9a2
limbs
2020-08-24 03:19:36 +01:00
Timothy Teakettle
e2aeaf8a5b
dont need this anymore
2020-08-23 21:55:21 +01:00
Timothy Teakettle
a7a6489f58
loadout loading
2020-08-23 21:48:38 +01:00
silicons
68ee7b12bf
Merge pull request #13236 from timothyteakettle/lizard-fixes
...
lizards are shitcode
2020-08-22 15:19:48 -07:00
Timothy Teakettle
60c8dd283e
shitcode begone
2020-08-22 20:02:36 +01:00
timothyteakettle
b40a42209d
fixes two snout paths
2020-08-19 03:19:51 +01:00
timothyteakettle
47424be1c0
tail fix
2020-08-18 00:46:05 +01:00
Timothy Teakettle
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
Lin
2fa0b4ae6c
Merge pull request #13105 from silicons/underwear_412
...
ports binder bras from rp
2020-08-14 13:03:25 -05:00
