shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,781 Commits 5 Branches 0 Tags
07fec51d920577f7ed89196d49c8487f4cf49ecf
Commit Graph

3671 Commits

Author SHA1 Message Date
Timothy Teakettle
07fec51d92 fix 2021-07-15 16:44:48 +01:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
22ad8f2c8c Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash 
[Ready] The Daily Whiplash (Newspaper Baton)
 2021-06-29 08:50:48 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7 
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
 2021-06-27 13:04:29 -07:00
silicons
5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos 
Replaces extools with auxtools; atmos overhaul
 2021-06-27 11:01:32 -07:00
silicons
08f251a88c Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-27 10:44:51 -07:00
WanderingFox95
eb74ad2137 And a recipe. 
You attach a newspaper to a telebaton with tape.
 2021-06-25 11:39:22 +02:00
Putnam3145
0f229495d0 aaand i forgot some /proc/s 2021-06-21 20:32:55 -07:00
Putnam3145
fbbae70527 i need to go to bed and this is a LOT 2021-06-21 10:14:50 -07:00
DeltaFire
c7a098da06 suffering (aka, a bunch of fixes) 2021-06-21 19:05:31 +02:00
Putnam3145
c253a2de86 alright how about these 2021-06-21 09:52:54 -07:00
Putnam3145
0bf383a90b does this fix it 2021-06-21 09:18:06 -07:00
Putnam3145
f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
silicons
3c7786dafd Merge pull request #14734 from keronshb/SpaceDragon 
(READY) Ports Space Dragon Midround Event.
 2021-06-18 20:03:43 -07:00
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
Putnam3145
dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
silicons
687d0adf23 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-16 19:04:07 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Timothy Teakettle
e12380cc40 Update embedded.dm (#14854) 2021-06-16 19:27:19 +02:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
f119081798 let's make this work 2021-06-15 12:03:34 -07:00
Lin
70de0547ab Merge pull request #14713 from silicons/json_interface 
adds json topic api for manifest, players, revision, and status.
 2021-06-14 20:17:05 -07:00
Lin
4ae09baa63 Merge pull request #14834 from silicons/on_found 
Fixes on_found triggering on storage
 2021-06-14 20:15:42 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
6495bbcc81 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-13 16:13:30 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
a88561d1aa Merge pull request #14770 from keronshb/spaceadaptaura 
Changes Space Adapt to a proper animated outline so it doesn't look awful.
 2021-06-13 15:19:08 -07:00
silicons
b6bb20842f Yelling works 2021-06-13 00:50:00 -07:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons
55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons
85b1125c83 fix 2021-06-12 04:36:02 -07:00
Putnam
833d34ba8e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-11 16:28:12 -07:00
Timothy Teakettle
e78929cde1 typo 2021-06-11 17:55:38 +01:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons
816b09bf32 Merge remote-tracking branch 'citadel/master' into backend_sync 2021-06-10 22:36:26 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
keronshb
ed929dda12 Changes up the animation a bit 2021-06-09 15:12:22 -04:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
silicons
b3382a8fe2 local testing time 2021-06-07 16:49:27 -07:00
silicons
40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
Putnam
d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
silicons
0d206742fa Update world_topic.dm 2021-06-01 21:35:49 -07:00
silicons
656d0545cd Update world_topic.dm 2021-06-01 01:32:54 -07:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
silicons
71db9298a1 Update world_topic.dm 2021-05-28 18:21:46 -07:00
keronshb
c1a9f9cfe9 GLOW ANIMATION 2021-05-28 17:40:43 -04:00