silicons
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
Lin
f2e0e5c247
Merge pull request #12814 from Citadel-Station-13/silicons-patch-35
...
fixes gateways switching to active power use when thy should not be using power at all
2020-07-19 11:10:51 -05:00
silicons
56f56d5cbe
Update gateway.dm
2020-07-18 10:24:36 -07:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
silicons
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Artur
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
Ghommie
e3b1ca4942
Linter.
2020-07-03 19:57:38 +02:00
Artur
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
Ghommie
9dc4b99620
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-30 00:49:06 +02:00
Artur
765ffdb1a1
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-06-26 14:03:27 +03:00
Detective Google
a406927c95
euthanizes spacebattle, helps wildwest a little (it's still shit)
2020-06-22 20:31:14 -05:00
Detective Google
98756b3bc7
snowdin is wack
2020-06-22 20:24:19 -05:00
Ghommie
de77b7139c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-06-23 00:13:14 +02:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
Detective Google
0e1db216c8
Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy)
2020-06-17 19:33:14 -05:00
Ghommie
30ab79e09e
Porting the twohanded component.
2020-05-17 18:16:53 +02:00
Artur
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
Ghommie
a9be1e06e2
Fixing stuff, it now should be ready.
2020-04-24 23:00:31 +02:00
Ghommie
58fc679cce
WIP
2020-04-24 20:49:15 +02:00
Artur
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
Artur
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
Ghom
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Ghommie
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
kevinz000
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
kevinz000
ea7c1058b5
Merge pull request #11524 from Ghommie/Ghommie-cit627
...
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
Putnam3145
368d47aa69
Adds ghost role eligibility to various ghost roles. ( #11549 )
...
* Added ghost role eligibility to CTF, possession, random animal
* Also added possessed blade to it.
* Also removed some extraneous dead/observer things.
* ahaha whoops
2020-03-22 13:02:23 +01:00
Ghommie
86898cc451
Force pushed updates
2020-03-22 01:43:19 +01:00
Ghommie
ea30b2fb1a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
2020-03-15 22:35:59 +01:00
kevinz000
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
Ghommie
d31075eb54
Spellcasting element
2020-03-11 16:23:30 +01:00
Ghommie
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
Ghommie
ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
Seris02
c3ec44b0d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-02-22 19:54:10 +08:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Seris02
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
Ghom
91824571ff
Merge pull request #11035 from Citadel-Station-13/kevinz000-patch-11
...
fixes ctf claymores not spawning and buffs them to be armor pierce + less stamina
2020-02-13 16:42:10 +01:00
Ghom
bfdef7fcfd
Merge pull request #10755 from kevinz000/attack_chain
...
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
kevinz000
77163c7909
Update capture_the_flag.dm
2020-02-12 00:44:52 -07:00
kevinz000
46d2dc24e9
Update capture_the_flag.dm
2020-02-12 00:43:04 -07:00
kevinz000
66a01c1fe9
Update capture_the_flag.dm
2020-02-12 00:32:40 -07:00
kevinz000
938091ff67
Update capture_the_flag.dm
2020-02-12 00:31:20 -07:00
kevinz000
41f02fa24d
Update capture_the_flag.dm
2020-02-12 00:26:58 -07:00
kevinz000
3a655d71d4
fix
2020-02-10 04:19:52 -07:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
Seris02
6cc6aa12be
yeehaw it's done
2020-02-05 16:54:57 +08:00
