shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

4155 Commits

Author SHA1 Message Date
Ghommie a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie 5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie 85ba7943db Less visual issues. 2019-10-29 04:58:24 +01:00
Ghommie 9d17e63314 sofa sprites armrest improvements. 2019-10-29 04:53:24 +01:00
Ghommie f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
Ghommie f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
kevinz000 d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07:00
Ghommie 80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +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
Ghommie 4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
kevinz000 dabfba8a0d Merge pull request #9619 from BlackMajor/Yote 
Buffs engiborg build potential
 2019-10-27 05:38:50 -07:00
TrilbySpaceClone 63cb466360 MK II 2019-10-26 18:59:34 -04:00
Ghommie 3b3a4f9af1 Updating a comment. 2019-10-26 15:06:02 +02:00
BlackMajor 1b2d1c1423 Whoops again 2019-10-27 02:04:46 +13:00
BlackMajor 90d28b7202 whoops 2019-10-26 23:00:12 +13:00
BlackMajor f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
nik707 187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
kevinz000 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Ghommie 79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +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 da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
kevinz000 2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie a62fcdcccb forgot about the file extension. 2019-10-25 03:34:13 +02:00
Ghommie ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02: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 29584aff69 emagged travis now succeeds. 2019-10-24 23:11:18 +02:00
Ghommie f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie 7b257242c2 bullets won't work... 2019-10-24 10:44:57 +02:00
Ghommie a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie 4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
Linzolle 9250b1c103 big uppdate season 2019-10-23 21:08:47 -05:00
deathride58 f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
Ghommie a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie ba307b01a5 Defib fixes and chem effects stuff 2019-10-23 13:45:57 +02:00
Ghommie fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
kevinz000 e226a79c9b Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art 
Code stuffs + more framework for cargo rework cuz atomic prs are good
 2019-10-22 23:11:56 -07:00
deathride58 68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
nik707 9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
nik707 fc56fd9f8b Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103 
Fixes and nerfs VTEC upgrades
 2019-10-22 16:48:10 -05:00
kevinz000 2426849d4b this is a pretty bad idea 2019-10-22 02:19:33 -07:00
Poojawa 7e27c46c78 Fuck components 2019-10-22 00:33:58 -05:00
Poojawa 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers 
Genpop for security
 2019-10-21 21:15:01 -04:00
Trilbyspaceclone b4b875bf26 Merge branch 'master' into A_Tailer's_art 2019-10-21 21:06:21 -04:00