shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,070 Commits 5 Branches 0 Tags
cfe5c7a96256ae00a0704b670d2f11cc84159c19
Commit Graph

211 Commits

Author SHA1 Message Date
LetterJay
d4d8c89fea Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019 
[MIRROR] Fixes drones being able to magically sense invisible revenants
 2018-05-25 22:50:40 -05:00
vuonojenmustaturska
10327267bb Fixes drones being able to magically sense invisible revenants (#38019) 
* revfix

* Update revenant.dm
 2018-05-25 08:08:57 -05:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
e7d9cd0698 Merge branch 'master' into upstream-merge-37597 2018-05-23 05:21:19 -05:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
LetterJay
adf1505c70 Merge pull request #6558 from Citadel-Station-13/upstream-merge-37486 
[MIRROR] Moves several clothing-specific flags from /atom to their proper type
 2018-05-22 07:18:34 -05:00
deathride58
9afa6b9290 Merge pull request #6779 from Citadel-Station-13/upstream-merge-37883 
[MIRROR] Fixes soulstone runtime
 2018-05-22 02:30:01 +00:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476 
[MIRROR] Uppercases slot defines.
 2018-05-21 11:23:02 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Nich
177139a1d3 Replace nauseous with nauseated (#37927) 2018-05-21 03:06:39 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
ShizCalev
49bf67ed1d Updates BYOND links to use HTTPS (#37918) 
* Updates BYOND links to use HTTPS

* revert

* if -> If
 2018-05-20 15:31:28 -05:00
LetterJay
19b8053159 Update soulstone.dm 2018-05-20 02:33:33 -05:00
LetterJay
33a6d7544f Merge pull request #6800 from Citadel-Station-13/upstream-merge-37892 
[MIRROR] Fixes changeling runtime after ghosting
 2018-05-19 09:15:03 -05:00
LetterJay
88ad927838 Merge pull request #6772 from Citadel-Station-13/upstream-merge-37870 
[MIRROR] Fixes decon message pronouns
 2018-05-19 09:10:29 -05:00
ShizCalev
1a64bb27e9 Fixes changeling runtime after ghosting (#37892) 2018-05-19 05:32:36 -05:00
LetterJay
5ea6164bbc Update revolution.dm 2018-05-17 23:50:25 -05:00
LetterJay
329aabf301 Update cult.dm 2018-05-17 23:50:17 -05:00
LetterJay
cceb549243 Update clockcult.dm 2018-05-17 23:50:08 -05:00
deathride58
146f953966 Merge pull request #6694 from Citadel-Station-13/upstream-merge-37423 
[MIRROR] [s] Hallucinations 4.0
 2018-05-17 18:12:57 +00:00
deathride58
583de894f3 Merge pull request #6763 from Citadel-Station-13/upstream-merge-37863 
[MIRROR] Fixes changeling team objectives (a bit)
 2018-05-17 18:10:01 +00:00
deathride58
b1d0d14834 Merge pull request #6771 from Citadel-Station-13/upstream-merge-37872 
[MIRROR] Fixes Adminorazine killing ash lizards
 2018-05-17 18:08:16 +00:00
ShizCalev
77f897e91c Fixes soulstone runtime 2018-05-17 10:59:12 -05:00
ShizCalev
e425a8514e Fixes sharp weapons deconverting revs (#37871) 
* Fixes sharp weapons deconverting revs

* enhanced commentary
 2018-05-17 10:28:38 -05:00
ShizCalev
9037a9745a Fixes decon message pronouns 2018-05-17 10:27:16 -05:00
ShizCalev
a7f13f15cf Fixes Adminorazine killing ash lizards (#37872) 
* Fixes Adminorazine killing ash lizards

* this should do it...
 2018-05-17 10:24:59 -05:00
vuonojenmustaturska
aa7a27420c Merge pull request #37863 from AnturK/rr4 
Fixes changeling team objectives (a bit)
 2018-05-16 14:35:49 -05:00
LetterJay
8efc7711a7 Merge branch 'master' into upstream-merge-37423 2018-05-16 12:17:57 -05:00
deathride58
ca36def4e6 Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823 
[MIRROR] Makes cult items less of a vomit coaster
 2018-05-16 16:09:21 +00:00
LetterJay
3103119f6b Update soulstone.dm 2018-05-16 09:04:51 -05:00
LetterJay
fe93e1ccbd Update cult_items.dm 2018-05-16 09:04:39 -05:00
vuonojenmustaturska
5e48fcd275 Merge pull request #37846 from DaxDupont/axe-time 
Small cult nerf do not be alarmed robustin think about your heart
 2018-05-16 04:46:59 -05:00
Dax Dupont
79b5e412f1 Makes cult items less of a vomit coaster 2018-05-15 12:18:00 -05:00
Jordan Brown
7dc1c116d5 Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons 
Fix some missing icons
 2018-05-14 15:13:33 -05:00
LetterJay
f9f42658e1 Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760 
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
 2018-05-14 12:28:41 -05:00
KorPhaeron
53ea3dcfe1 Buckled/held cultists cant be teleport summoned (#37805) 2018-05-13 12:08:37 -05:00
kevinz000
9510c12065 Fixes morphs (#37772) 2018-05-11 17:30:41 -05:00
Tad Hardesty
021f30f0c0 Fixed stacks sometimes having the wrong amount if created on another stack 2018-05-11 17:30:32 -05:00
XDTM
ec3516ea19 [s] Hallucinations 4.0 2018-05-09 16:15:58 -05:00
Lexorion
2c33868d8a makes the cultblade use the right inhand files 2018-05-09 15:48:40 -05:00
deathride58
06fc24e953 Makes it plausible for the lone operative event to roll if the nuclear disk stays still for long enough (#37468) 
* makes it possible for the lone operative event to roll if the nuclear disk stays still for long enough

* makes the event weight increase chance reset if the disk moves

* slows this shit *WAY* down, adds a minimum time for the weight to start rolling for an increase (approximately 10 minutes)

* .

* this was an absolute pain in the ass to test - addresses reviews

* addresses ninjanomnom's review, makes it possible for the loneop event weight to decrease if the disk moves
 2018-05-06 16:38:25 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
e0e950e9ff Update spellbook.dm 2018-05-06 03:10:54 -04:00