shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,699 Commits 5 Branches 0 Tags
49941ea2e675ee2a9ce54e4fa4e4159a48ca89e1
Commit Graph

4888 Commits

Author SHA1 Message Date
BlackMajor 83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
BlackMajor 725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix 
[TESTMERGE] Explosion/bomb armor rework
 2019-12-13 10:20:33 +13:00
Putnam3145 9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451 
Fixing character setup preview icons.
 2019-12-12 09:30:34 -08:00
Ghommie 3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Linzolle acffa683c9 clearer message? 2019-12-12 00:40:08 -06:00
kappa-sama b89d04884e indents oops 2019-12-11 17:23:00 -05:00
kappa-sama 2b8f81bca3 idk maybe 2019-12-11 17:22:14 -05:00
kappa-sama be3439e461 idk maybe? 2019-12-11 16:57:06 -05:00
Ghommie 651370c5b4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2019-12-11 21:10:24 +01:00
Lin 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Seris02 dfc8a1dc73 fixes it 
if it breaks I blame you again putnam
 2019-12-11 03:08:52 +08:00
Ghommie 8ed21b47b6 Grammar and something. 2019-12-10 16:20:57 +01:00
Ghommie 19a3aca619 I fear for my powernet 2019-12-10 15:33:15 +01:00
BlackMajor 8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2019-12-10 11:18:55 +13:00
Putnam3145 ee65d93e5a Merge pull request #10086 from Ghommie/Ghommie-cit441 
Fixes AI core display I may have broken with my coding extravaganza.
 2019-12-09 13:41:25 -08:00
Putnam3145 beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
kevinz000 1866276d38 wrong intent 2019-12-08 22:13:15 -07:00
kevinz000 0dc69942a9 Update carbon.dm 2019-12-08 22:08:29 -07:00
kevinz000 cd1cf1e1e3 Update carbon.dm 2019-12-08 22:01:50 -07:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Lin 9c7ac9a469 Merge pull request #10071 from Ghommie/Ghommie-cit434 
Fixes bubblegum's death not unlocking the arena shuttle buyment since the medals subsystem is not hub enabled
 2019-12-08 20:01:50 +00:00
Artur 9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
Useroth 1d0438800e Touched up a copy-paste leftover. 2019-12-08 17:04:11 +01:00
Useroth ea4f57beb6 Spaghettid my way around the errors. 2019-12-08 16:47:21 +01:00
Useroth 5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Useroth a37f2de71d First step of porting lavaland tumors. Looks like Cita is much behind tg regarding simplemobs. 2019-12-08 14:00:08 +01:00
kappa-sama cdda28f85c tabs 2019-12-08 03:54:55 -05:00
kappa-sama 48be47d4d1 yes? 2019-12-08 03:54:29 -05:00
kappa-sama 52a050e9ee maybe 2019-12-08 03:54:02 -05:00
kappa-sama b015d2571a ==? 2019-12-08 03:51:36 -05:00
kappa-sama 10c844e70d does this even work 2019-12-08 03:36:09 -05:00
Lin 24e4673c2b Merge pull request #10057 from Ghommie/Ghommie-cit431 
fixes on_mob eyes overlays not updating properly in certain cases.
 2019-12-07 21:49:18 +00:00
Artur 4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Ghommie f83d1c4763 Made kevlar and armor padding accessories inconspicious and examine-proof. 2019-12-07 10:53:10 +01:00
Ghommie a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
TrilbySpaceClone 025a7cd79a more ports 
https://github.com/tgstation/tgstation/pull/46924
https://github.com/tgstation/tgstation/pull/48050
 2019-12-07 03:04:02 -05:00
TrilbySpaceClone c4450579ac Why does breakfast have a timer? 
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
 2019-12-07 01:53:55 -05:00
Ghommie 7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie 0a0094e80c Fixes stuff I broke with my coding extravaganza. 2019-12-07 05:11:29 +01:00
Unknown 97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Ghommie 542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie 72c093d14e Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435 2019-12-06 19:05:50 +01:00
Ghommie 91e628c73d Ports timestop and sepia extracts improvements/tweaks. 2019-12-06 19:01:42 +01:00
Ghommie 2addcb4142 Fixes bubblegum's death not granting the arena shuttle because the medals subsystem is not hub enabled 2019-12-06 16:37:46 +01:00
kevinz000 968e9c099d Update silicon.dm 2019-12-06 01:12:44 -07:00
Putnam3145 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430 
Ports "Slightly improves visible and audible messages."
 2019-12-05 21:16:47 -08:00
lolman360 08e1ab7b21 f 2019-12-06 16:11:41 +11:00
lolman360 dec79a9ba3 gg 2019-12-06 15:55:52 +11:00
kevinz000 6a305dfe4f Merge pull request #9955 from Ghommie/Ghommie-cit394 
Updating supply pods code.
 2019-12-05 21:54:42 -07:00
Putnam3145 6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00