shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,353 Commits 5 Branches 0 Tags
12a69dcee5b67c1908d3f9fded2670b3e6f3ea35
Commit Graph

1669 Commits

Author SHA1 Message Date
kevinz000 0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295 
Removing references to national socialism
 2019-11-03 06:18:47 -07:00
kevinz000 a9cf83476f Merge pull request #9674 from Ghommie/Ghommie-300 
Updating ratvarian computer sprites.
 2019-11-03 06:15:17 -07:00
Ghommie 9f97f768da Respriting the ore redemption and miner vending machines. 2019-10-31 18:59:00 +01:00
Ghommie 56b65130fb Modernizing ratvarian computer sprites. 2019-10-31 01:17:21 +01:00
kevinz000 e6046d62d6 Merge pull request #9528 from Ghommie/Ghommie-cit244 
Fixes some peculiarities with hands layer overlapping stuff
 2019-10-29 21:38:24 -07:00
kevinz000 66faef41f8 Merge pull request #9350 from Tupinambis/UIChanges 
Cyborg UI Beautification and Improvements
 2019-10-29 21:33:34 -07:00
kevinz000 8d1707f837 Merge pull request #9602 from Ghommie/Ghommie-cit266 
Offsets the new linen bin sprites 6 pixels up.
 2019-10-29 21:26:21 -07:00
kevinz000 303175c1b8 Merge pull request #9615 from Ghommie/Ghommie-cit274 
Resprited wooden and critter crates.
 2019-10-29 21:25:29 -07:00
kevinz000 86aafd016b Merge pull request #9652 from Ghommie/Ghommie-cit289 
sofa sprites armrest improvements.
 2019-10-29 21:24:07 -07:00
kevinz000 cf89cfdd2d Merge pull request #9647 from Ghommie/Ghommie-cit287 
Arcade machine directional sprites.
 2019-10-29 21:22:26 -07:00
kevinz000 bc3dd51db3 Merge pull request #9626 from Ghommie/Ghommie-cit278 
Unmodularize space kiwis and banana spiders.
 2019-10-29 21:21:14 -07:00
Ghommie 005c87bdf6 I'm making a joke title, don't ban me github. 2019-10-30 01:31:29 +01:00
Ghommie 9d17e63314 sofa sprites armrest improvements. 2019-10-29 04:53:24 +01:00
Ghommie f42e835add tweak. 2019-10-29 03:09:38 +01:00
Ghommie 502b02303b Arcade machine directional sprites. 2019-10-28 23:31:39 +01:00
BlackMajor 5894b148a8 Merge pull request #9636 from Ghommie/Ghommie-cit282 
Gang dominator sprite update.
 2019-10-29 10:36:50 +13:00
BlackMajor 6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again 
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
 2019-10-28 16:47:02 +13:00
deathride58 2c017b1f86 Merge pull request #9633 from Citadel-Station-13/onionneck 
onion necklace
 2019-10-27 20:43:01 -04:00
Ghommie 13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00
kevinz000 880b4039e7 Merge pull request #9622 from Ghommie/Ghommie-cit275 
Tweaking the Cyber Sylph's barsign.
 2019-10-27 16:10:08 -07:00
kevinz000 19729ee706 Merge pull request #9623 from Ghommie/Ghommie-cit276 
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
 2019-10-27 16:09:20 -07:00
kevinz000 309cf531aa Merge pull request #9627 from Ghommie/Ghommie-cit279 
Unmodularize MkII hyposprays and other reagent items sprites.
 2019-10-27 16:09:04 -07:00
Ghommie efdb850129 Gang dominator sprite update. 2019-10-27 23:59:40 +01:00
Jay 9d830610bb onion necklace 2019-10-27 11:52:38 -05:00
kevinz000 dabfba8a0d Merge pull request #9619 from BlackMajor/Yote 
Buffs engiborg build potential
 2019-10-27 05:38:50 -07:00
Ghommie bf92aa2ffb Unmodularize MkII hyposprays and other reagent items sprites. 2019-10-26 19:14:28 +02:00
Ghommie c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02:00
Ghommie 5bccde6e70 Ports "New Teleporter Station sprites." and "Add teleport station calibration animation." 2019-10-26 15:25:26 +02:00
Ghommie f597b323ee Tweaking the Cyber Sylph's barsign. 2019-10-26 14:55:12 +02:00
BlackMajor f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
kevinz000 daf4acbceb Merge pull request #9599 from Ghommie/Ghommie-cit264 
Ports "New Revenant icons"
 2019-10-25 20:13:05 -07:00
kevinz000 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Ghommie d792c25767 resprited wooden and critter crates. 2019-10-26 01:23:00 +02:00
Ghommie c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 12:26:17 +02:00
kevinz000 9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000 9fd3ef7801 Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again 2019-10-24 18:36:04 -07:00
kevinz000 31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
Ghommie 4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 2019-10-25 00:27:04 +02:00
Ghommie 85b35433b2 Unmodularize Eutactic Blades. 2019-10-25 00:14:38 +02:00
Ghommie f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie 6b95611ae9 another 3 px 2019-10-24 20:59:13 +02:00
Ghommie 17a79bc7f9 Offsets the new linen bin sprites 3 pixels up. 2019-10-24 20:56:06 +02:00
Ghommie aeca5f5fb2 ffs 2019-10-24 12:21:57 +02:00
Ghommie cfa3a4b5eb Forgot about augments for a moment. 2019-10-22 08:48:39 +02:00
Poojawa 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58 ee0357b2c4 Merge pull request #9214 from Sishen1542/mechshit 
properly ports neovgre from hippie
 2019-10-21 21:17:57 -04:00
deathride58 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Poojawa 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Ghommie 281f4e29dc Fixes some peculiarities with hands layer overlapping stuff 2019-10-18 10:23:43 +02:00