shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,150 Commits 5 Branches 0 Tags
8fef121064f6cf64592a45bdd08bec20fbb316fb
Commit Graph
38150 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay 8fef121064 Fixes missing hair when wearing halo 2020-09-25 10:45:13 -05:00
CitadelStationBot d18e47d9e1 Automatic changelog generation for PR #13426 [ci skip] 2020-09-24 23:40:43 -05:00
Putnam3145andGitHub f6d9d4b535 Merge pull request #13426 from CoreFlare/master 
Gives IPCs hair.
 2020-09-24 21:40:41 -07:00
Changelogs c31366f2a7 Automatic changelog compile [ci skip] 2020-09-25 00:15:08 +00:00
CitadelStationBot d5f4f04736 Automatic changelog generation for PR #13430 [ci skip] 2020-09-24 08:15:29 -05:00
siliconsandGitHub a1b5c9fa47 Merge pull request #13430 from Putnam3145/removeRemoveNullsFromList 
Removes removeNullsFromList, cause it doesn't work.
 2020-09-24 06:15:25 -07:00
Putnam 6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Changelogs 0e867f37e6 Automatic changelog compile [ci skip] 2020-09-24 00:15:22 +00:00
CitadelStationBot a08baf782c Automatic changelog generation for PR #13380 [ci skip] 2020-09-23 16:40:00 -05:00
siliconsandGitHub 7ca1b1dc79 Merge pull request #13380 from Putnam3145/cache-locality-experiments 
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
 2020-09-23 14:39:56 -07:00
Putnam3145andGitHub c41add450a Merge pull request #13425 from Arturlang/TGUI_Updoot 
Fixes some statpanel Issues
 2020-09-23 14:19:22 -07:00
CoreFlare 1901677fdb finally. species_traits=list(HAIR) 2020-09-23 19:11:34 +01:00
Artur e483cf06b3 fIXD 2020-09-23 19:54:30 +03:00
Artur d493886875 Speedmerge fix 2020-09-23 19:14:50 +03:00
Changelogs 66db3c57d5 Automatic changelog compile [ci skip] 2020-09-23 00:14:22 +00:00
Putnam 2e877b8c50 Hardcoded fusion scan results as "fusion" to fix a runtime. 
It didn't need to be id anyway??
 2020-09-22 00:23:13 -07:00
LetterJayandGitHub b5685852a6 Merge pull request #13393 from Citadel-Station-13/customskirt 
[Ready] Donator Item - Custom Skirt
 2020-09-21 22:48:21 -05:00
Jay 3864f14843 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-21 22:19:45 -05:00
Changelogs 665610c559 Automatic changelog compile [ci skip] 2020-09-22 00:14:38 +00:00
Putnam e89e7adda4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments 2020-09-21 03:31:35 -07:00
CitadelStationBot 21903d3a24 Automatic changelog generation for PR #13329 [ci skip] 2020-09-21 05:11:11 -05:00
siliconsandGitHub 90aa47f339 Merge pull request #13329 from Arturlang/TGUI_Updoot 
TGUI updates + statpanel
 2020-09-21 03:11:06 -07:00
Artur 410550220b Fixed admin hide most verbs 2020-09-21 10:39:09 +03:00
CitadelStationBot 2ebb3b4d47 Automatic changelog generation for PR #13402 [ci skip] 2020-09-20 23:30:11 -05:00
siliconsandGitHub 8de3bcb08f Merge pull request #13402 from timothyteakettle/limbs 
copying prefs always regenerates icons now (attempt to stop preview icons being outright wrong)
 2020-09-20 21:30:08 -07:00
CitadelStationBot bd9d7add04 Automatic changelog generation for PR #13408 [ci skip] 2020-09-20 23:24:12 -05:00
siliconsandGitHub 26eebf3b32 Merge pull request #13408 from YakumoChen/dont-be-a-dick-shinji 
Get in the damn robot, Skylar
 2020-09-20 21:24:08 -07:00
Changelogs e2403bb84d Automatic changelog compile [ci skip] 2020-09-21 00:15:18 +00:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
siliconsandGitHub 16430dab4c Merge pull request #13410 from Citadel-Station-13/doniconfix 
added wrong state for halo and skirt, fixed with this
 2020-09-19 18:46:26 -07:00
Jay b69c467047 added wrong state for halo and skirt, fixed with this 2020-09-19 20:19:49 -05:00
Changelogs 997d5c8598 Automatic changelog compile [ci skip] 2020-09-20 00:15:13 +00:00
Jay 67cc7ea04e getting annoying 2020-09-19 10:02:34 -05:00
GhomandGitHub b29143ea03 Merge pull request #13364 from Citadel-Station-13/silicons-patch-34 
projectile process invoke async because people keep breaking shit and trying to enforce do not sleep on it is a moot point because people keep breaking shit
 2020-09-19 16:53:55 +02:00
CitadelStationBot d0701ddcc0 Automatic changelog generation for PR #13382 [ci skip] 2020-09-19 08:07:07 -05:00
Putnam3145andGitHub 62228905da Merge pull request #13382 from Citadel-Station-13/silicons-patch-36 
hulks no longer break their hand from punching a wall
 2020-09-19 06:07:04 -07:00
Putnam3145andGitHub 9c305d1db6 Merge pull request #13400 from silicons/shields 
adds two procs to find exterior tiles for projecting hull shields around for later pr
 2020-09-19 06:06:46 -07:00
Putnam3145andGitHub ccbacfb0bf Merge pull request #13403 from Citadel-Station-13/silicons-patch-38 
fixes joystick users getting kicked for hacking. again.
 2020-09-19 06:05:25 -07:00
CitadelStationBot 20e2c030dc Automatic changelog generation for PR #13399 [ci skip] 2020-09-19 08:04:51 -05:00
GhomandGitHub 868e464b40 fixes linter issues, removes acid degrading armor (#13399) 
* fix

* more

* Update brawn.dm

* Update ticketmachine.dm
 2020-09-19 15:04:48 +02:00
Putnam3145andGitHub e52ba8d883 Merge pull request #13406 from Citadel-Station-13/silicons-patch-39 
fixes airlock wire runtimes from non-user wire damage
 2020-09-19 06:04:31 -07:00
CitadelStationBot 3d2afcae42 Automatic changelog generation for PR #13394 [ci skip] 2020-09-19 08:02:36 -05:00
siliconsandGitHub 54f48c3754 Merge pull request #13394 from DeltaFire15/attack-runtime-fixes 
Some bodypart-related fixes
 2020-09-19 06:02:32 -07:00
CitadelStationBot b4f383df6d Automatic changelog generation for PR #13401 [ci skip] 2020-09-19 07:59:12 -05:00
siliconsandGitHub 994a0e66e2 Merge pull request #13401 from MrJWhit/chess-sprite-update 
Porting new chess sprites
 2020-09-19 05:59:08 -07:00
Jay de9986bd4a oops 2020-09-18 19:24:53 -05:00
Jay a2ad87bebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
 2020-09-18 19:23:31 -05:00
deathride58andGitHub 6956266013 Merge pull request #13404 from Citadel-Station-13/Donatorfix 
Hopefully fixes icon overlay issue for the halo
 2020-09-18 18:19:10 -04:00
Jay 16e6d309b6 makes skirt a under clothing instead of a suit 2020-09-18 16:56:42 -05:00
YakumoChenandGitHub d9539db437 adds mech suits (properly) 2020-09-18 17:39:00 -04:00