shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph

5768 Commits

Author SHA1 Message Date
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
zerothebigboy fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04: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
zerothebigboy 1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04: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
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 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
silicons d67c4d9fa8 hacky 2021-06-07 16:45:51 -07:00
silicons 2d763a9ab3 auto 2021-06-07 16:37:19 -07:00
keronshb 40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04:00
DeltaFire b2e2c49011 plasmamen & golems 2021-06-02 17:47:57 +02:00
DeltaFire 0f01a4a7da huh 2021-06-01 22:52:39 +02:00
DeltaFire dd33371a3b colors 2021-06-01 22:48:57 +02:00
keronshb 70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
WanderingFox95 df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
keronshb 7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
keronshb 78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
zerothebigboy bd186d25cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 2021-05-23 15:29:20 -04:00
silicons eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL 
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
 2021-05-23 08:52:25 -06:00
silicons 92e019dd56 Merge pull request #14716 from Putnam3145/fix-blacklisting-traits 
Makes species/antag trait blacklist no longer remove ALL traits
 2021-05-22 03:41:57 -06:00
silicons e1a800ff49 Merge pull request #14742 from keronshb/specialhudport 
(READY) Ports Special Hud icons for some simple mobs
 2021-05-22 01:37:59 -06:00
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07:00
keronshb 88dc0821d1 User gibs when being turned into a spess dragon 2021-05-19 19:49:48 -04:00
keronshb 1d843cc72f Part 3 - the missing stuff 2021-05-19 19:19:35 -04:00
keronshb a15637a929 Part 1 of Health Bars for Space Dragon 2021-05-19 19:18:19 -04:00
keronshb a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
Lin 0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00