shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,992 Commits 5 Branches 0 Tags
8a1a4dd6715bd030daf6101fa413ae341bb8e28a
Commit Graph

93 Commits

Author SHA1 Message Date
LetterJay
c877fdb501 Merge branch 'master' into upstream-merge-28046 2017-06-14 13:10:37 -05:00
LetterJay
813bcc2b8d commit 2017-06-14 11:16:54 -05:00
CitadelStationBot
b1da43d3f7 Clarification on hardsuit variants in traitor uplink 2017-06-11 08:29:25 -05:00
LetterJay
47687a6d1a cleanup 2017-06-10 09:42:08 -05:00
LetterJay
522b6d917f updates 2017-06-10 09:36:39 -05:00
LetterJay
7189249f66 Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115 
[MIRROR] A large and unasked for  repath and improvement of accessories (formerly ties, but actually armbands and medals)
 2017-06-10 09:01:25 -05:00
LetterJay
8a628cf13f Delete ties.dm 2017-06-10 09:00:08 -05:00
CitadelStationBot
1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot
9725329268 A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) 2017-06-07 03:06:15 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
CitadelStationBot
f03aa5e0fa Adds some more syndicate equipment. 2017-06-05 13:50:54 -05:00
CitadelStationBot
159f78efe7 Fixes #27989 : Riot suits no longer hide jumpsuits (#1379) 2017-06-04 09:09:03 -07:00
CitadelStationBot
dceafe4122 Adds some silly new meson failure excuses 2017-05-30 11:12:56 -05:00
CitadelStationBot
de413c89de Fixes mesons giving the wrong message when toggling off 2017-05-29 06:32:10 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
LetterJay
2d41b7fe17 EHHH 2017-05-28 15:49:22 -05:00
LetterJay
42edd006b8 A BUNCH OF SHIT 2017-05-28 14:57:17 -05:00
LetterJay
fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725 
[MIRROR] Changes incorporeal movement to use defines
 2017-05-28 14:33:22 -05:00
LetterJay
33aae484d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-27 22:49:44 -05:00
LetterJay
fdb54c3ce3 hat 2017-05-27 22:49:20 -05:00
CitadelStationBot
2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
LetterJay
0137b79f6c Merge pull request #1195 from Citadel-Station-13/upstream-merge-27537 
[MIRROR] Adds goliath cloak & a recipe (Lavaland PvE primitive item)
 2017-05-26 23:22:31 -05:00
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot
a84bcdd42e Adds goliath cloak & a recipe (Lavaland PvE primitive item) 2017-05-26 11:14:20 -05:00
CitadelStationBot
7d75b70ff0 Renames a var 2017-05-24 16:21:19 -05:00
LetterJay
936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
CitadelStationBot
074b684b4d Armour Description Changes 2017-05-24 00:11:57 -05:00
CitadelStationBot
e6617661f9 Gives all hats a default icon/item state so they work with chameleon gear. 2017-05-23 07:58:48 -05:00
CitadelStationBot
6b4b6ee70d Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls 2017-05-22 22:21:20 -05:00
LetterJay
ab50a3eca5 Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283 
[MIRROR] Decentralized and Vastly Improved Gang Influence System
 2017-05-22 16:28:57 -05:00
CitadelStationBot
7df5632d6e Minor Grammar Fixes 2017-05-21 22:28:29 -05:00
CitadelStationBot
c39b60b3cf Decentralized and Vastly Improved Gang Influence System 2017-05-20 18:37:48 -05:00
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00
CitadelStationBot
7a9e05e9d9 Cerestation Tweaks MK VII: BEES edition (#925) 2017-05-18 10:36:51 -05:00
CitadelStationBot
a317d23a51 [MIRROR] Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie (#916) 
* Manifest Spirit is better for summoning cannon fodder but slightly worse for instantly summoning Nar-Sie

* fixes .rej
 2017-05-18 09:37:30 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
8bcaa54cbe [MIRROR] Fixes language code ignoring holder restrictions (#858) 
* Fixes language code ignoring holder restrictions

* resolve .rej file.
 2017-05-18 04:13:57 -05:00
CitadelStationBot
257cf986c5 Repaths C4 (#808) 
* Repaths C4

* Delete tgstation.2.1.3.dmm.rej

* Add files via upload

* update CitadelStation-1.2.1.dmm
 2017-05-18 00:37:20 -05:00
LetterJay
a1c04dd314 Merge pull request #898 from LetterJay/master 
Adds a hunter hat to the game/clothesmate
 2017-05-12 16:24:17 -04:00
CitadelStationBot
2625269439 t-ray mode on goggles resets lighting (#885) 2017-05-10 16:05:55 -07:00
CitadelStationBot
5b2521dad4 Tweaks the curator's access and clothing to improve his treasure hunting ability (#882) 2017-05-10 16:05:33 -07:00
LetterJay
43dd22425b Citadel hat DMI/DM 
Cleans up pointless files
 2017-05-10 17:33:13 -05:00
CitadelStationBot
44c29c6193 Fixes clothing damage message (#831) 2017-05-08 16:44:38 -07:00
kevinz000
2e0dd27978 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813 2017-05-07 22:28:00 -07:00
CitadelStationBot
884338d048 Fixes being able to stand on chasms 2017-05-07 18:06:44 -05:00
CitadelStationBot
0639a54346 Hopefully makes flightsuit processing less taxing on the server 2017-05-04 06:01:53 -05:00
CitadelStationBot
33a93a611b Curator Update 2017-05-03 22:22:12 -05:00
LetterJay
6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay
2bef665038 Merge pull request #613 from Citadel-Station-13/upstream-merge-26563 
[MIRROR] Renames generic armor and athletic shorts
 2017-05-02 11:14:47 -05:00
LetterJay
8af590f075 Merge pull request #591 from Citadel-Station-13/upstream-merge-26601 
[MIRROR] When jumpsuits take severe damage, their suit sensors break.
 2017-05-02 11:10:13 -05:00