shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,855 Commits 5 Branches 0 Tags
6445cfdd9d35e29188df2ee151b4fa36dc3ce667
Commit Graph

6134 Commits

Author SHA1 Message Date
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid 
Componentizes acid
 2021-07-13 11:52:43 -07:00
Lin
daf837f89e Merge pull request #14924 from Citadel-Station-13/restraints 
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
 2021-07-12 00:03:39 -07:00
Lin
3b1bef2729 Merge pull request #14922 from Putnam3145/remove-dirt-buildup 
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
 2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693 yes 2021-07-10 22:53:14 -07:00
DeltaFire
dd71d12359 aaaaaaaaa 2021-07-05 15:28:39 +02:00
silicons
18fb23bb1f Update carbon.dm 2021-07-04 18:19:31 -07:00
silicons
2b1aa8a6fc Merge pull request #14911 from Putnam3145/euclidean-diagonals 
Makes diagonal movement euclidean
 2021-07-04 10:58:08 -07:00
silicons
1620aa46da Update carbon.dm 2021-07-04 10:55:02 -07:00
Putnam3145
21c77d25a2 yeah yeah sure whatever 2021-07-03 22:40:09 -07:00
Putnam3145
2be56ab992 Removes causes_dirt_buildup_on_floor 2021-07-03 22:19:05 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145
15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145
e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
Putnam3145
f1bcbc2573 Makes diagonal movement euclidean 2021-07-01 12:09:39 -07: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
a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop 
Moves tendril KA upgrade disks to blood drunk miner.
 2021-06-29 08:51:10 -07:00
shellspeed1
26cb16311d A 2021-06-27 20:08:33 -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
Lin
3a82712cf9 Merge pull request #14881 from Citadel-Station-13/silicons-patch-42 
fixes silicon examine
 2021-06-23 09:50:11 -07:00
Putnam3145
630098c8aa that might be all 2021-06-21 20:03:27 -07:00
silicons
0dd8c03286 Update examine.dm 2021-06-21 17:43:05 -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
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
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
silicons
66dde6f9ea woo 2021-06-14 14:00:02 -07:00
silicons
01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
8224546cfc ok 2021-06-13 15:36:20 -07:00
silicons
e7f5f80fb1 yelling 2021-06-13 15:34:47 -07:00
Putnam
a9db30d6d9 optimization, fix to breath, experimenting with speed 2021-06-13 07:31:01 -07:00
silicons
e84f7ae4ac fix 2021-06-13 01:16:44 -07:00
silicons
b6bb20842f Yelling works 2021-06-13 00:50:00 -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
Putnam
571a25c052 Finished the first auxgm expansion 2021-06-11 16:15:00 -07:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
Putnam
eda6a4d2e2 Aaaa 2021-06-11 05:23:24 -07:00
Putnam
3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00