shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,182 Commits 5 Branches 0 Tags
503d0156c6215ba02e66441706ae8d2cddb67ccc
Commit Graph

932 Commits

Author SHA1 Message Date
silicons
44dc292101 Update preferences_savefile.dm (#13557) 2020-10-17 13:58:33 +02: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 b48f4b91e6, reversing
changes made to dc70d17a1e.
 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 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
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
silicons
6094cd7191 Merge pull request #13508 from DeltaFire15/robotic-fixes 
bodypart fixes - robotic bodypart & digitigrade edition
 2020-10-03 14:32:45 -07:00
DeltaFire
79af981467 fixes some fun limb code 2020-10-03 21:51:49 +02:00
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08: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
e1123ad7fe color define 2020-10-01 18:55:32 +01:00
silicons
fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot 
Fixes vore prefs (I was looking in the wrong place the whole time)
 2020-10-01 03:10:04 -07:00
silicons
bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites 
adds luminescent and stargazer sprites as selectable body sprites for slimes
 2020-10-01 03:06:41 -07:00
silicons
46a80af956 Merge pull request #13317 from LetterN/what-if-the-savefile-itself-is-teakproof-questionmark_charachter 
Ports tgstation/tgstation#52549
 2020-10-01 02:56:39 -07: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
Putnam
c644495e5e dodgin bullets 2020-09-29 21:07:41 -07:00
Putnam
0c7003b3a5 never code while tired 2020-09-29 20:37:48 -07:00
Putnam
f8200a5838 Shitcode fixing inop code. 2020-09-29 06:40:09 -07:00
timothyteakettle
396872e98e show the right thing 2020-09-28 23:21:34 +01:00
Timothy Teakettle
783c33067b typo moment 2020-09-28 22:13:33 +01:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Putnam3145
c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot 
Fixes some statpanel Issues
 2020-09-23 14:19:22 -07:00
Artur
e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
silicons
90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot 
TGUI updates + statpanel
 2020-09-21 03:11:06 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Timothy Teakettle
e67fbed1ba always regenerate icons 2020-09-15 18:37:14 +01:00
timothyteakettle
2bb19003a0 thanks kevin 2020-09-07 01:47:30 +01:00
Timothy Teakettle
8f6c353ad0 memory leak bad 2020-09-05 21:35:02 +01:00
Timothy Teakettle
4bbec8eae1 travis lets be friends 2020-09-04 12:45:23 +01:00