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

115 Commits

Author SHA1 Message Date
CitadelStationBot
dec17dcfe6 Dog beds can now be renamed after new owners (#1238) 2017-05-28 15:11:06 -07: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
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
LetterJay
6d8aa16c45 Merge pull request #917 from Citadel-Station-13/upstream-merge-27119 
[MIRROR] Wraiths now refund part of Phase Shift's cooldown by attacking
 2017-05-17 10:47:06 -04:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
LetterJay
c329a74c4b Merge pull request #942 from Citadel-Station-13/upstream-merge-27173 
[MIRROR] Fixes something not using create_reagents
 2017-05-14 16:29:44 -04:00
LetterJay
6ab7cfe9b9 Merge pull request #957 from Citadel-Station-13/upstream-merge-27215 
[MIRROR] Petting is better
 2017-05-14 16:27:08 -04:00
CitadelStationBot
e661d82030 Goats eat glowshrooms 2017-05-14 07:38:00 -05:00
CitadelStationBot
962d114339 Petting is better 2017-05-14 07:36:55 -05:00
LetterJay
00b17f1649 maybe 2017-05-14 00:28:07 -05:00
CitadelStationBot
b0bfcdabe9 Fixes something not using create_reagents 2017-05-13 18:01:12 -05:00
CitadelStationBot
4c2d6e4ef5 Wraiths now refund part of Phase Shift's cooldown by attacking 2017-05-11 20:40:18 -05:00
kevinz000
9f7dd3fe16 Update ghost.dm 2017-05-10 17:53:27 -07:00
CitadelStationBot
afdf829abc [MIRROR] Visible ghosts emit light (#877) 
* Visible ghosts emit light

* Update ghost.dm

* Delete ghost.dm.rej
 2017-05-10 16:16:23 -07:00
LetterJay
9687080cd0 Crab/Carp DEVOURALE = TRUE 2017-05-09 21:04:08 -05:00
kevinz000
bd8bfe1327 Merge pull request #684 from Citadel-Station-13/upstream-merge-26728 
[MIRROR] A bunch of sparks to do_sparks [Travis error unrelated to PR]
 2017-05-07 22:41:24 -07:00
kevinz000
68e1087825 Merge pull request #823 from Citadel-Station-13/upstream-merge-26959 
[MIRROR] Mega arachnid
 2017-05-07 19:17:10 -07:00
LetterJay
2efe90055f Revert "[MIRROR] Fixes say verbs not working" 2017-05-07 19:41:33 -04:00
CitadelStationBot
617bb4ed38 Mega arachnid 2017-05-07 08:55:11 -05:00