21c77d25a2
yeah yeah sure whatever
2021-07-03 22:40:09 -07:00
2be56ab992
Removes causes_dirt_buildup_on_floor
2021-07-03 22:19:05 -07:00
899e74fc83
Componentized acid
2021-07-03 22:10:44 -07:00
970e089fb0
glass houses
2021-07-03 03:52:07 -07:00
15078f0f71
Properly optimizes watchers
2021-07-03 03:50:43 -07:00
e11cc190e7
Watcher optimization
2021-07-03 03:40:34 -07:00
f1bcbc2573
Makes diagonal movement euclidean
2021-07-01 12:09:39 -07:00
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
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
5e1cb8da38
more
2021-06-28 14:27:38 -07:00
805b931fb8
config reorganize start
2021-06-28 13:35:52 -07:00
7c87f6c7b7
sigh
2021-06-28 13:17:55 -07:00
0069f12c6f
errors
2021-06-28 13:17:14 -07:00
a5a476f457
cyborg shovies
2021-06-28 13:10:40 -07:00
a73ca4be46
scope creep lmao
2021-06-28 12:29:18 -07:00
26cb16311d
A
2021-06-27 20:08:33 -07:00
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
5204f5a6d9
Merge pull request #13991 from Putnam3145/auxtools-atmos
...
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
3a82712cf9
Merge pull request #14881 from Citadel-Station-13/silicons-patch-42
...
fixes silicon examine
2021-06-23 09:50:11 -07:00
630098c8aa
that might be all
2021-06-21 20:03:27 -07:00
0dd8c03286
Update examine.dm
2021-06-21 17:43:05 -07:00
fbbae70527
i need to go to bed and this is a LOT
2021-06-21 10:14:50 -07:00
c7a098da06
suffering (aka, a bunch of fixes)
2021-06-21 19:05:31 +02:00
0bf383a90b
does this fix it
2021-06-21 09:18:06 -07:00
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
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
3c7786dafd
Merge pull request #14734 from keronshb/SpaceDragon
...
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
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
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
5619b73e6b
Makes it actually, actually work
2021-06-16 02:02:28 +03:00
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
66dde6f9ea
woo
2021-06-14 14:00:02 -07:00
01e0fa16fe
it works.
2021-06-14 13:52:48 -07:00
8595e05ad9
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-13 15:37:35 -07:00
8224546cfc
ok
2021-06-13 15:36:20 -07:00
e7f5f80fb1
yelling
2021-06-13 15:34:47 -07:00
a9db30d6d9
optimization, fix to breath, experimenting with speed
2021-06-13 07:31:01 -07:00
e84f7ae4ac
fix
2021-06-13 01:16:44 -07:00
b6bb20842f
Yelling works
2021-06-13 00:50:00 -07:00
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
571a25c052
Finished the first auxgm expansion
2021-06-11 16:15:00 -07:00
baad78e7fe
bee
2021-06-11 16:08:55 +01:00
eda6a4d2e2
Aaaa
2021-06-11 05:23:24 -07:00
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07:00
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
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
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
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
ec63a4c62b
Merge pull request #14779 from Arturlang/Orbit_menu_antags
...
Makes orbit menu show antags if DNR
2021-06-09 11:17:14 -07:00
Putnam3145