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

135 Commits

Author SHA1 Message Date
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync 
Selective mirror sync
 2017-06-14 06:41:01 -05:00
LetterJay
2a5be91970 compile fixes 2017-06-12 16:12:00 -05:00
LetterJay
55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay
28d4372aa0 upstream-merge-27852 2017-06-11 00:20:55 -05:00
LetterJay
b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
CitadelStationBot
fb40986f89 Fixes basic spiderlings becoming ice spiders 2017-06-10 12:22:48 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay
71bb6c930c Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652 
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
 2017-06-06 09:01:33 -05:00
LetterJay
962177c423 Merge branch 'master' into upstream-merge-27652 2017-06-05 23:16:40 -05:00
LetterJay
54549d43a2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728 2017-06-05 23:07:52 -05:00
CitadelStationBot
1c1cbe8e5b Refactor another spawn var (#1395) 2017-06-04 09:04:56 -07:00
CitadelStationBot
e59e7f8d06 Fixes bsa not showing up (#1396) 2017-06-04 09:03:30 -07:00
CitadelStationBot
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -07:00
LetterJay
976086e490 Merge branch 'master' into upstream-merge-27534 2017-05-30 16:45:59 -05:00
CitadelStationBot
6b01698202 You can pet dogs again. 2017-05-29 08:58:43 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot
f42bcaf760 Finally remembers to make drakes unclickable while they're in the invulnerable stage of swooping (#1262) 2017-05-28 15:28:51 -07:00
CitadelStationBot
dec17dcfe6 Dog beds can now be renamed after new owners (#1238) 2017-05-28 15:11:06 -07:00
CitadelStationBot
243148f27c [Centcom] Nanotrasen Private Security 2.0 2017-05-28 16:39:14 -05:00
CitadelStationBot
c07034f45a The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it 2017-05-27 20:55:08 -05:00
CitadelStationBot
2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
CitadelStationBot
d1e38d9e1f Fixed very minor capitalization and punctuation inconsistencies. (#1104) 2017-05-27 13:43:20 -07:00
CitadelStationBot
4e381aaca4 Fixes legion icon (#1222) 2017-05-27 13:33:30 -07:00
CitadelStationBot
51dd042af5 Necropolis tendrils glow again (#1228) 2017-05-27 13:30:25 -07:00
LetterJay
10f5f27bf0 Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554 
[MIRROR] Prevents inserted inert legion cores from healing
 2017-05-24 08:33:58 -05:00
LetterJay
34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
CitadelStationBot
fa9785e90e Prevents inserted inert legion cores from healing 2017-05-24 00:15:13 -05:00
LetterJay
febefa0c78 Something I broke in a previous PR that I didn't see 2017-05-23 10:11:19 -05:00
CitadelStationBot
e02290bf2b Replaced mob spawner vars with outfits 2017-05-23 07:57:42 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -05:00
LetterJay
abbacd2c89 Merge branch 'master' into upstream-merge-27160 2017-05-22 16:29:43 -05:00
LetterJay
3548ed5e3e i'll fix this in another PR 2017-05-22 12:27:59 -05:00
CitadelStationBot
4533d31e34 Cult Fixes for Construct Icons and Spells 2017-05-22 10:49:33 -05:00
CitadelStationBot
25df88509a Reorganizes martial arts and stores them in the MIND. 2017-05-22 07:13:10 -05:00
kevinz000
7e2cebe1db Merge branch 'master' into upstream-merge-27344 2017-05-21 17:50:29 -07:00
CitadelStationBot
0924db6d41 Re-removes "the station" from drone law 3 (#1075) 2017-05-21 17:45:06 -07:00
CitadelStationBot
e224a47f53 Two more types of Legion and makes environment_smash levels into defines 2017-05-21 02:52:23 -05:00
Poojawa
45ba084c6a Merge branch 'master' into upstream-merge-27344 2017-05-20 23:26:28 -05:00
CitadelStationBot
88ede32216 [MIRROR] Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition (#994) 
* Cult 2017 Overhaul 1.5: The End - Been finished for 5 days edition

* Rej cleanup

* update mob.dmi

* Update living_defense.dm
 2017-05-20 23:00:02 -05:00
cebutris
644a31ed98 Misc. guardian stuff (#1066) 
* beep boop

* Fixes one last inconsistency. Oops.

* punctuation
 2017-05-20 17:54:39 -07:00
LetterJay
4d48592008 Merge pull request #1051 from cebutris/holofixes 
No More Free Parasites
 2017-05-19 22:46:30 -05:00
cebutris
893eb92833 no more free parasites 2017-05-18 18:04:42 -04:00
CitadelStationBot
a430e24555 Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual 2017-05-18 16:38:09 -05:00
CitadelStationBot
d5b0150e99 Buffs hierophant club 2017-05-18 16:36:38 -05:00
CitadelStationBot
c61bb0476f [MIRROR] Cleans up some Initializes (#943) 
* Cleans up some Initializes

* Update farm_animals.dm

* Delete farm_animals.dm.rej

* Update farm_animals.dm
 2017-05-18 11:13:53 -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
6617f68604 [MIRROR] Harvesters are more fun to play (#894) 
* Harvesters are more fun to play

* resolve .rej
 2017-05-18 07:12:29 -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
5da8c5d520 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26952 2017-05-17 10:12:36 -05:00