shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

3278 Commits

Author SHA1 Message Date
BlackMajor f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13: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 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
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
Poojawa 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
BlackMajor b77a94bd7d Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88 
buffs c4 on mobs
 2019-10-22 11:04:30 +13:00
kevinz000 c0d4d32dee Update robot_upgrades.dm 2019-10-21 14:36:21 -07:00
Ghommie 760522cf6a Fixing some ayy overlays and client images oddities. 2019-10-21 11:29:43 +02:00
kevinz000 9c8356d9ea Update defib.dm 2019-10-19 20:48:55 -07:00
kevinz000 094fdbd271 Update defib.dm 2019-10-19 19:49:48 -07:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Ghommie 9cb1f2b9d9 Little stunbaton nerf (split off from #9500) 2019-10-18 18:37:15 +02:00
Ghommie 2ca246d2eb fine-o 2019-10-18 18:33:02 +02:00
Ghommie 69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
TrilbySpaceClone 18c9283d4a Merge branch 'master' into A_Tailer's_art 2019-10-18 00:21:42 -04:00
kevinz000 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL 
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
 2019-10-17 13:23:33 -07:00
kevinz000 033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240 
Fixing tracking implant teleport issues.
 2019-10-17 13:05:15 -07:00
kevinz000 8be030a931 Merge pull request #9482 from Thalpy/Wiki 
Gives chemistry a library (and updates buttons at the top right of the game too).
 2019-10-17 13:01:37 -07:00
kevinz000 65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238 
Ports some in operator misuse bugfixes.
 2019-10-17 12:59:44 -07:00
Ghommie 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000 ae19dd16d8 Merge pull request #9486 from ZeroNetAlpha/Janiborg-noms 
Borgs are now consumable by scrub pups.
 2019-10-15 22:59:20 -07:00