90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
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
f6bbfc2c88
Merge pull request #13513 from timothyteakettle/eye-sprites
...
adds selectable eye types to customization
2020-10-06 16:51:44 -07:00
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
46ebb72905
Merge branch 'master' into loadout-loading
2020-10-04 01:43:17 +01:00
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
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
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
5d4429a61a
You can now have none
2020-10-01 12:57:07 -05:00
0bb889932d
Completed!
2020-09-30 19:05:56 -05:00
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
106b8ccead
Merge branch 'master' into heterochromia
2020-09-24 22:09:03 +01:00
435565f1d8
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
2020-09-21 00:16:12 +03:00
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
0d8374a328
organic rendering
2020-09-16 05:09:21 +01:00
57ca2fbbe9
Updates ghost verbs on ghostize
2020-09-07 16:30:18 +03:00
1a79ffaf79
RE_Enter works properly now
2020-09-07 16:17:03 +03:00
b795806067
This shouldnt have been removed
2020-09-07 13:12:11 +03:00
589bedcfaf
Fixes alt click, themes a little, and re enter corpse
2020-09-07 13:06:34 +03:00
a175c397f0
No you are not going to know what roundtype it is sorry
2020-09-07 10:27:05 +03:00
8f6c353ad0
memory leak bad
2020-09-05 21:35:02 +01:00
cdaef63fa1
sorry travis
2020-09-03 23:07:19 +01:00
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
4f82f063db
dummies
2020-09-03 22:09:50 +01:00
9e2ee588c9
rp prosthetics
2020-09-03 22:05:21 +01:00
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
ae482c1bb8
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
2020-08-29 14:09:56 +08:00
1d943a34ef
heterochromia
2020-08-28 18:30:28 +01:00
be22486913
this hurt to do manually
2020-08-24 19:55:10 +01:00
cd7293a9a2
limbs
2020-08-24 03:19:36 +01:00
e2aeaf8a5b
dont need this anymore
2020-08-23 21:55:21 +01:00
a7a6489f58
loadout loading
2020-08-23 21:48:38 +01:00
68ee7b12bf
Merge pull request #13236 from timothyteakettle/lizard-fixes
...
lizards are shitcode
2020-08-22 15:19:48 -07:00
60c8dd283e
shitcode begone
2020-08-22 20:02:36 +01:00
7a7a6fbe68
asset moment.
2020-08-22 16:41:13 +08:00
b40a42209d
fixes two snout paths
2020-08-19 03:19:51 +01:00
47424be1c0
tail fix
2020-08-18 00:46:05 +01:00
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
b56742beb5
Merge branch 'pr-13110'
2020-08-16 18:40:23 -07:00
2fa0b4ae6c
Merge pull request #13105 from silicons/underwear_412
...
ports binder bras from rp
2020-08-14 13:03:25 -05:00
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
b16f920479
Merge pull request #13086 from ArchieBeepBoop/dev
...
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
035422ed7f
Merge pull request #13098 from LetterN/ToS-component
...
Mafia Component
2020-08-11 01:41:13 -07:00
Ghommie