Commit Graph

131 Commits

Author SHA1 Message Date
zerothebigboy 0bc3c5292c arooga 2021-01-28 12:31:23 -05:00
silicons a973a3b088 Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
2021-01-27 19:08:25 -07:00
zerothebigboy ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
zerothebigboy ad2864f137 aeughfuck 2021-01-27 13:30:44 -05:00
silicons 718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
Blue Wildrose c79177ab07 Adds Timid wo/man outfits 2021-01-18 13:42:38 -07:00
silicons 30b1cd82f9 . 2021-01-17 12:02:12 -07:00
shellspeed1 58426beadc readds missing none wings for insects 2021-01-09 16:15:50 -08:00
shellspeed1 679f097e27 resets names 2021-01-09 15:39:50 -08:00
shellspeed1 773a04e5ea Ports wings 2021-01-09 01:56:56 -08:00
shellspeed1 98f8af853c Minor xenohybrid changeschanges
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
2021-01-06 01:58:58 -08:00
Poojawa 6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06: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
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
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 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
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 0d8374a328 organic rendering 2020-09-16 05:09:21 +01:00
Timothy Teakettle be22486913 this hurt to do manually 2020-08-24 19:55:10 +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
Timothy Teakettle 4a2bbe66d6 Merge branch 'master' into cum 2020-08-11 18:30:30 +01:00
silicons b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
timothyteakettle b9efa05ec4 double FUCK 2020-08-11 03:40:41 +01:00
timothyteakettle 84a8585055 FUCK 2020-08-11 03:38:25 +01:00