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
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
Ghommie
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
Artur
e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
Seris02
18489e5b65
merge fixes
2020-02-02 11:51:26 +08:00
Ghommie
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
Arturlang
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
kevinz000
d5d0a7d7ba
Update capture_the_flag.dm
2020-01-26 22:16:18 -07:00
kevinz000
2c1b63cdb9
Update capture_the_flag.dm
2020-01-26 22:07:49 -07:00
kevinz000
f9ee9bdadf
Update capture_the_flag.dm
2020-01-26 21:54:23 -07:00
Seris02
e45cc4933c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
2020-01-27 08:33:38 +08:00
kevinz000
f59a9d0009
aight bet
2020-01-26 14:05:15 -07:00
kevinz000
c74a6eaf4c
Update capture_the_flag.dm
2020-01-25 09:20:41 -07:00
Seris02
74be93a8cc
hasSiliconAccessInArea vars change
2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed
hijack implant
2020-01-18 18:04:31 +08:00
Artur
8b8a112d2c
Ohkay
2020-01-15 09:41:33 +02:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Seris02
ac4489c6a8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-11 13:55:29 +08:00
Ghommie
825b4f01c2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2020-01-10 02:26:19 +01:00
BlackMajor
375e59a77d
Merge branch 'master' into Yeehaw
2019-12-29 22:12:40 +13:00
Seris02
862acf2f06
ports hyper's genetics
2019-12-28 21:33:15 +08:00