3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
24c2ab8b8c
Merge pull request #14940 from timothyteakettle/trash-eating
...
adds a neutral trash eating quirk
2021-07-18 15:07:29 -07:00
b0c53fcc57
Merge pull request #14947 from Arturlang/crafting_fixes
...
Crafting menu cleaning up
2021-07-18 15:07:12 -07:00
7cd89978f2
Merge pull request #14933 from keronshb/stripdcport
...
[PORT] Stripping a disconnected player will tell them when they come back (+Lazynull)
2021-07-18 15:05:48 -07:00
b71a6497e8
Crafting menu fixes and such
...
Fixes crafting buttons making more of themselves on relogs, and cleans some wierd as fuck shit.
2021-07-16 03:23:02 +03:00
6445cfdd9d
Removes spontaneous vore and reorganizes buttons
2021-07-15 17:32:03 -03:00
3cb44d41a3
upload files
2021-07-14 00:35:30 -03:00
39c09a60b8
initial commit
2021-07-13 23:45:31 +01:00
c7d1c9d8e8
Ports Stripping log when dc'd
2021-07-07 21:12:44 -04:00
f1bcbc2573
Makes diagonal movement euclidean
2021-07-01 12:09:39 -07:00
a73ca4be46
scope creep lmao
2021-06-28 12:29:18 -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
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -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
3c7786dafd
Merge pull request #14734 from keronshb/SpaceDragon
...
(READY) Ports Space Dragon Midround Event.
2021-06-18 20:03:43 -07:00
ae6a648c4b
Merge pull request #14869 from bunny232/21/79-the-finale
...
21/79 the finale now with less map merge issues woops
2021-06-18 20:02:07 -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
84068b467a
Merge pull request #14658 from silicons/backend_sync
...
Updates tgui and build backend, fixes the build.bat for those with latest eslint (?)
2021-06-18 17:23:35 -07:00
fb9cc6fe45
Update atmospherics.dm
2021-06-18 05:25:02 -04:00
5d574acdc2
Merge pull request #14794 from Citadel-Station-13/silicons-patch-35
...
updates GLOB.flags to the new byond limit of 24 flags in one variable, up from 16.
2021-06-18 00:47:07 -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
c1928c9446
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-16 19:04:16 -07:00
687d0adf23
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-06-16 19:04:07 -07:00
f3e16b298b
https://github.com/tgstation/tgstation/pull/56588
2021-06-16 01:15:21 +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
55e8d67521
refactor a bit
2021-06-12 04:41:58 -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
eda6a4d2e2
Aaaa
2021-06-11 05:23:24 -07:00
816b09bf32
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-06-10 22:36:26 -07:00
3b25f3e199
Started expanding auxgm a bit
2021-06-10 04:40:23 -07: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
33affb4f10
THREE SECONDS
2021-06-09 15:14:07 -04:00
a77aa8bd41
Merge pull request #14766 from Linzolle/cultfix
...
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
eb4b4088f4
Merge pull request #14760 from keronshb/floorcluwneport
...
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
b28d4f26f3
Merge pull request #14803 from bunny232/airmixies
...
21/79 not 20/80
2021-06-09 11:18:10 -07:00
eaf36d3137
Update _flags.dm
2021-06-09 11:16:55 -07:00
fe8323f503
Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
...
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
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
40f2c06f2e
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-07 16:47:11 -07:00
7952a1cf88
this actually does not need named this way
2021-06-07 05:31:41 -07:00
26544ddbb7
21/79 not 20/80
2021-06-06 17:24:10 -04:00
829944640e
Update _flags.dm
2021-06-04 09:24:15 -07:00
70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
46833abf0b
add cult_permitted area flag
2021-05-27 19:34:00 -05:00
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
9e3c1ff860
adds floor cluwnes from yog
2021-05-24 22:46:59 -04:00
36fe3fef76
abuse
2021-05-24 21:40:15 -04:00
silicons