timothyteakettle
ede19dd47d
Update preferences_savefile.dm
2020-11-01 23:25:09 +00:00
Timothy Teakettle
22823f629d
an actual fix
2020-11-01 20:40:08 +00:00
Timothy Teakettle
f4f322dd0e
better fix
2020-10-30 19:39:43 +00:00
timothyteakettle
cf49e78d45
Merge remote-tracking branch 'upstream/master' into i-hate-mcolor
2020-10-27 22:12:55 +00:00
timothyteakettle
a987420d22
fix for mam markings
2020-10-27 21:40:07 +00:00
timothyteakettle
a9f2b86da9
tonne of fixes
2020-10-27 21:32:08 +00: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
Timothy Teakettle
06bbddd248
Update preferences_savefile.dm
2020-10-21 18:20:14 +01:00
Timothy Teakettle
ab35f8cf66
include literally everything
2020-10-21 15:47:42 +01:00
Timothy Teakettle
f5cc216a4c
travis segfaulted
2020-10-18 21:51:58 +01:00
Timothy Teakettle
c53eeff33f
travis segfaulted
2020-10-18 21:51:36 +01:00
Timothy Teakettle
f965b78960
remove debug messages
2020-10-18 21:36:51 +01:00
Timothy Teakettle
8e2345d2f7
FUCK
2020-10-18 21:36:17 +01:00
Timothy Teakettle
2ac3bbbaf3
fix
2020-10-18 21:09:20 +01:00
Timothy Teakettle
bb46fa319c
fix
2020-10-18 18:34:07 +01:00
Timothy Teakettle
bfb3546ccc
save/load
2020-10-18 18:16:29 +01:00
Timothy Teakettle
40efc4b8c8
cleanup and migration fix
2020-10-18 18:05:59 +01:00
Timothy Teakettle
87387f45d1
fixes
2020-10-17 23:32:08 +01:00
Timothy Teakettle
5e780064c1
fixes and a toggle
2020-10-17 19:47:46 +01:00
silicons
44dc292101
Update preferences_savefile.dm ( #13557 )
2020-10-17 13:58:33 +02:00
timothyteakettle
04e1d9fc39
more fixes
2020-10-17 03:42:14 +01:00
timothyteakettle
d5a1834788
more fixes
2020-10-17 01:40:02 +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
Putnam3145
cbb6020d49
Merge pull request #13553 from timothyteakettle/eye-sprites
...
fixes eye sprites up
2020-10-11 11:56:08 -07:00
Timothy Teakettle
89f2c53d88
ignore those reverts
2020-10-11 18:23:56 +01:00
Timothy Teakettle
5aff38597f
Revert "Revert "Revert "Revert "customizable eyes""""
...
This reverts commit d852aacb78
2020-10-11 17:11:01 +01:00
Timothy Teakettle
d852aacb78
Revert "Revert "Revert "customizable eyes"""
...
This reverts commit dedfdf224d
2020-10-11 16:55:07 +01:00
Timothy Teakettle
1f800064de
Revert "Revert "Merge branch 'master' into eye-sprites""
...
This reverts commit d3a042deaa
2020-10-11 16:55:00 +01:00
Timothy Teakettle
dedfdf224d
Revert "Revert "customizable eyes""
...
This reverts commit 9f3d745d80
2020-10-11 16:54:53 +01:00
Timothy Teakettle
b76b97fbe9
Revert "Revert "eyes""
...
This reverts commit 4526fef297
2020-10-11 16:54:50 +01:00
Timothy Teakettle
4526fef297
Revert "eyes"
...
This reverts commit 0c99b53c05
2020-10-11 16:54:12 +01:00
Timothy Teakettle
9f3d745d80
Revert "customizable eyes"
...
This reverts commit dc70d17a1e
2020-10-11 16:54:09 +01:00
Timothy Teakettle
d3a042deaa
Revert "Merge branch 'master' into eye-sprites"
...
This reverts commit b48f4b91e6dc70d17a1e
2020-10-11 16:54:05 +01: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
silicons
03a47bda6d
Merge pull request #13252 from timothyteakettle/loadout-loading
...
qol: looking at loadout equips your loadout items on you instead of job items
2020-10-06 16:50:08 -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
silicons
655d505316
Merge pull request #13507 from LetterN/subsystem-updoots
...
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07: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
timothyteakettle
dc70d17a1e
customizable eyes
2020-10-04 01:19:29 +01:00
Timothy Teakettle
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
