shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,699 Commits 5 Branches 0 Tags
bfcaceb4e182f82fec5a4b1df65a52ccbfd5ced5
Commit Graph

174 Commits

Author SHA1 Message Date
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
e425a8514e Fixes sharp weapons deconverting revs (#37871) 
* Fixes sharp weapons deconverting revs

* enhanced commentary
 2018-05-17 10:28:38 -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
11c1e8fbf7 Merge pull request #6632 from Citadel-Station-13/upstream-merge-37620 
[MIRROR] Remove a leftover reference to the gang dominator
 2018-05-06 07:03:37 +00:00
kevinz000
6669328929 alt morph nerf (#37654) 2018-05-05 14:54:06 -05:00
Armhulen
a00364268e ot dealing with bad grammar today (#37637) 2018-05-04 06:50:34 -05:00
Jordan Brown
19140f2cb2 Merge pull request #37620 from AutomaticFrenzy/patch/dominator 
Remove a leftover reference to the gang dominator
 2018-05-03 08:41:32 -05:00
deathride58
97ad0f39a7 Merge pull request #6552 from Citadel-Station-13/upstream-merge-37081 
[MIRROR] adds new changeling var that counts actual absorbs, uses it for Spiders ability
 2018-05-02 01:17:58 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
adf349db02 Update spiders.dm 2018-04-29 18:44:31 -04:00
deathride58
9d33974316 Update absorb.dm 2018-04-29 18:44:14 -04:00
deathride58
c075dbfe81 Update changeling_power.dm 2018-04-29 18:43:52 -04:00
LetterJay
c11c2ba70f Merge pull request #6544 from Citadel-Station-13/upstream-merge-37479 
[MIRROR] Fixes being unable to place a Robotic Factory if it failed to place after the prompt
 2018-04-29 02:25:37 -05:00
PKPenguin321
dee55fa47d adds new changeling var that counts actual absorbs, uses it for Spiders ability 2018-04-27 20:22:14 -05:00
ShizCalev
c9ac7ab2a1 Fixes being unable to place a Robotic Factory (#37479) 2018-04-27 13:12:15 -05:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
LetterJay
96a461e384 Merge pull request #6451 from Citadel-Station-13/upstream-merge-37218 
[MIRROR] Couple of fixes for situations involving mechas and the clock cult gamemode
 2018-04-22 02:34:53 -05:00
vuonojenmustaturska
32fe9d4fd6 Couple of fixes for situations involving mechas and the clock cult gamemode (#37218) 
* couple of mech fixes

* safety

* gateway, gravity gen

* Restores oingo-boingo punch-nuke
 2018-04-18 09:33:31 -05:00
Jordan Brown
889f8ddb06 Merge pull request #37229 from vuonojenmustaturska/centcommission 
Add team objective support to the centcom antag datum
 2018-04-16 16:17:42 -05:00
shrimpboom8
677f3e8a7b Fixes imps all having the same name (#37168) 
* Update imp.dm

* Replaced 1 with TRUE
 2018-04-14 08:10:07 -05:00
LetterJay
8dec1d8926 Merge pull request #6363 from Citadel-Station-13/upstream-merge-37110 
[MIRROR] fixes changelings stinging other lings twice
 2018-04-14 07:44:22 -05:00
LetterJay
508e4f4d37 Update tiny_prick.dm 2018-04-12 07:03:26 -05:00
deathride58
538cb55b68 Merge pull request #6346 from Citadel-Station-13/upstream-merge-36791 
[MIRROR] Cult spell buttons will no longer hold an empty slot in the regular action bar
 2018-04-11 21:35:45 +00:00
imsxz
cfd3f7a4fd fixes changelings stinging other lings twice 2018-04-11 07:33:21 -05:00
vuonojenmustaturska
e9d2097610 Fixes warp whistle invis bug (#37077) 
* Update artefact.dm

* review
 2018-04-11 07:28:30 -05:00
Robustin
a79a168d2c Cult spell buttons will no longer hold an empty slot in the regular action bar (#36791) 2018-04-11 05:08:47 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
AnturK
a3f873e4b2 Makes revheads always show on top of the check antags listing. (#37033) 2018-04-08 19:23:24 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
vuonojenmustaturska
4b505112fc fixes revenant deadchat 2018-04-04 09:07:06 -05:00
deathride58
edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442 
[MIRROR] Refactors Spell and Martial Art Books to use Action Granters!
 2018-04-03 08:16:11 +00:00
kevinz000
91f9596eec damnit (#36886) 2018-04-02 02:13:03 -05:00