shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,526 Commits 5 Branches 0 Tags
e1cf63e0ac1663ffb3079581f2d3bc1491fe02f5
Commit Graph

3618 Commits

Author SHA1 Message Date
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
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
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
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
kevinz000
54be35a243 Merge pull request #9997 from Sishen1542/nuked 
removes superspeed from nuka cola
 2019-12-05 21:48:34 -07:00
Putnam3145
3633c6936d Merge pull request #10052 from Ghommie/Ghommie-cit428 
Banishes some "me" emote magic numbers from this realm.
 2019-12-05 20:47:39 -08:00
kevinz000
5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412 
Ports tgstation loom changes, and durathred golems.
 2019-12-05 21:44:25 -07:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
kevinz000
bd1b79b182 Merge pull request #10041 from kappa-sama/patch-8 
[SALT] chargers and chaos stands are now reasonable to fight
 2019-12-05 21:29:39 -07:00
kevinz000
bbd482015c Merge pull request #10033 from Ghommie/Ghommie-cit419 
Fixes traitor codewords highlight and some other hear signal hooks.
 2019-12-05 21:28:03 -07:00
Ghommie
d6fe78f4a7 fixes on_mob eyes overlays not updating properly sometimes. 2019-12-06 03:38:39 +01:00
Ghommie
5024e900f7 Ooow fuck. 2019-12-06 02:45:55 +01:00
Ghommie
f1ccccbf36 drake. 2019-12-06 02:14:15 +01:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Ghommie
53ff425f04 Banishes some magic numbers from this realm. 2019-12-05 21:55:28 +01:00
Artur
82d1497ddc Fixes bad buds and toxin healing 2019-12-05 17:29:00 +02:00
kappa-sama
7d77159748 5->20 2019-12-04 21:04:47 -05:00
Ghommie
ccd966ed28 Update, fix. 2019-12-04 20:32:25 +01:00