shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,831 Commits 5 Branches 0 Tags
07a5f052d36bdc33ccef0f5ef4141d94d280c5fb
Commit Graph

6298 Commits

Author SHA1 Message Date
Seris02
f565c1cd3c adds some distance checks 2019-12-12 18:48:25 +08:00
kevinz000
dfec60c557 Merge pull request #10140 from Putnam3145/dynamic-not-in-secret 
Makes secret's dynamic roundstart report not tell people to contact a coder
 2019-12-11 14:38:49 -07:00
kevinz000
77327ba899 Merge pull request #10143 from Putnam3145/dynamic-midround-doubledip 
Dynamic no longer double dips on refunds for ghost antags with not enough applicants
 2019-12-11 14:38:17 -07:00
Linzolle
6c8dc1d294 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre-noise 2019-12-10 17:57:26 -06:00
Linzolle
bdd72fc797 make sound work? 2019-12-10 17:54:52 -06: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
Putnam
7b10c57b5c Actually gotta rework this properly 2019-12-10 14:01:33 -08:00
Putnam
1de118d40e Dynamic no longer double dips on refunds for ghost antags 2019-12-10 13:55:58 -08:00
Putnam
10879d9984 rejection logging too 2019-12-10 10:26:18 -08:00
Putnam
cda0e3470a Added a bunch of logging to dynamic. 2019-12-10 10:09:24 -08:00
Putnam
7880340142 Make dynamic message in secret not bug me 2019-12-10 07:58:13 -08:00
kevinz000
f421649647 Update atoms_movable.dm 2019-12-09 23:00:59 -07: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
BlackMajor
8ce9dcc471 Merge pull request #10082 from Citadel-Station-13/kevinz000-patch-122 
Bluespace launchpad QoL (read: powercreep)
 2019-12-10 11:16:59 +13:00
BlackMajor
716df40d7a Merge pull request #10083 from Ghommie/Ghommie-cit439 
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter.
 2019-12-10 11:15:56 +13:00
Putnam3145
0a8dcc3712 Merge pull request #10113 from Ghommie/Ghommie-cit448 
Fixes a long lasting runtime with filter data sorting.
 2019-12-09 13:49:41 -08:00
kevinz000
d8dd0a4db5 bet 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-09 12:45:27 -07:00
Artur
488c0f1833 Mindshield fix and thrall buff 2019-12-09 19:08:42 +02:00
Seris02
d73cb74f95 clown loudmode headset 2019-12-09 21:40:39 +08:00
kevinz000
4ba64f5fa7 Update atoms_movable.dm 2019-12-08 22:05:13 -07:00
kevinz000
5cbcc06497 Update objs.dm 2019-12-08 22:04:32 -07:00
kevinz000
f8c6f0eb8a Update items.dm 2019-12-08 22:03:35 -07:00
Lin
7794cea49c Merge pull request #9538 from Citadel-Station-13/kevinz000-patch-99 
Brings the combat back in combat defibrillator (DOES NOT BUFF CMO DO NOT YELL AT ME)
 2019-12-09 04:33:23 +00:00
kevinz000
9869c1c440 Merge pull request #10099 from Ghommie/Ghommie-cit446 
Fixes a few holo barriers lacking transparency.
 2019-12-08 19:05:10 -07:00
loginsandylogout
2c08f7ac95 oops 2019-12-08 17:25:17 -06:00
loginsandylogout
1bae17a2de gauze 2019-12-08 17:24:12 -06:00
loginsandylogout
17782a8c87 ports refactor 2019-12-08 17:10:50 -06: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
6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423 
Made wooden cabinet/closets... actually made of wood.
 2019-12-08 22:18:15 +00:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Lin
ef01bbd222 Merge pull request #10075 from Ghommie/Ghommie-cit436 
Demodularize defib disks and projectiles icons.
 2019-12-08 20:15:01 +00:00
Artur
9773b530f8 More fixes. Urgh 2019-12-08 21:47:25 +02:00
kevinz000
83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
Ghommie
a9335aa946 Fixes a long lasting runtime with filter data sorting. 2019-12-08 13:21:29 +01:00
Hatterhat
6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
Lin
a91139c470 Merge pull request #10068 from Ghommie/Ghommie-cit433 
Ports "Makes the windup toolbox more similar to His Grace".
 2019-12-07 21:52:10 +00: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
Useroth
28ddfd29b6 Merge branch 'master' into new-tg-plants 2019-12-07 14:25:38 +01:00
Ghommie
95cc84e69e Fixes a few holo barriers' transparency. 2019-12-07 12:13:33 +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
Useroth
5f56d40f58 Incorporated the bamboo grammar fixes. 2019-12-07 06:41:24 +01: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
e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
kevinz000
2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
Artur
19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
Useroth
1158c03ed7 Added bamboo. 2019-12-06 19:00:10 +01:00