DeltaFire
d3f30d21cf
Merge pull request #13772 from silicons/respawn_system_2
...
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons
ce10278c5a
changes
2020-12-20 19:25:49 -07:00
Poojawa
6fe6e6d779
Update Citadel_Snowflake.dm
2020-12-18 01:36:56 -06:00
silicons
a4688557d7
Cryo
2020-12-13 02:29:31 -07:00
silicons
07d8e72125
fix
2020-12-12 11:19:45 -07:00
silicons
24c09edd03
stuff
2020-12-12 11:12:45 -07:00
silicons
45a7c68da1
wow
2020-12-11 15:05:00 -07:00
Timothy Teakettle
45b22b2855
final touches
2020-12-11 19:41:56 +00:00
timothyteakettle
d1003c206a
debug
2020-12-11 01:57:09 +00:00
Timothy Teakettle
62b5430985
yes
2020-12-10 21:53:20 +00:00
timothyteakettle
73542f6688
Update new_player.dm
2020-12-09 17:49:52 +00:00
timothyteakettle
264b72f91d
better verification
2020-12-09 02:01:37 +00:00
Timothy Teakettle
d3ad092869
new proc
2020-12-08 22:23:58 +00:00
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
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
timothyteakettle
8126eb5a12
fixes a lot of things
2020-11-02 23:07:27 +00:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
Timothy Teakettle
f17bf787e7
render antennas
2020-10-23 20:19:25 +01: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
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 73b5267425 , reversing
changes made to 2e780bfff2 .
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