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

157 Commits

Author SHA1 Message Date
kevinz000
9510c12065 Fixes morphs (#37772) 2018-05-11 17:30:41 -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
LetterJay
dd579e35bc Merge pull request #6183 from Citadel-Station-13/upstream-merge-36548 
[MIRROR] Added a new ability to sentient diseases
 2018-04-01 19:50:43 -05:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
LetterJay
b6873e9bd4 Merge pull request #6219 from Citadel-Station-13/upstream-merge-36857 
[MIRROR] you can now walk through abductor table frames
 2018-04-01 17:47:07 -05:00
LetterJay
6d117d18a3 Update spellbook.dm 2018-04-01 17:44:04 -05:00
YPOQ
a18aec6fa5 Fixes revenants being unable to siphon after failing a siphon 2018-04-01 08:33:39 -05:00
vuonojenmustaturska
7e639116f6 Merge pull request #36857 from iskyp/ayytableframes 
you can now walk through abductor table frames
 2018-04-01 07:33:14 -05:00
LetterJay
9dfa66afea Update spellbook.dm 2018-04-01 04:40:12 -05:00
LetterJay
24d4b310cd Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147 
[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
 2018-04-01 01:01:55 -05:00
LetterJay
19df345067 Merge pull request #6191 from Citadel-Station-13/upstream-merge-36787 
[MIRROR] Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-31 18:42:51 -05:00
LetterJay
fa64b72ea6 Merge pull request #6180 from Citadel-Station-13/upstream-merge-36781 
[MIRROR] Get_Flat_Human_Icon no longer draws asses that nobody wants
 2018-03-31 18:39:15 -05:00
LetterJay
c3ddcb9da7 Merge pull request #6162 from Citadel-Station-13/upstream-merge-36628 
[MIRROR] Fixes "ocular wardens don't target buckled mobs"
 2018-03-31 06:20:12 -05:00
Jordan Brown
c48b35a0b2 Merge pull request #36787 from Davidj361/36744-twistedHealthFix 
Removed health cost for Twisted Construction upon casting on a wrong object
 2018-03-31 06:16:50 -05:00
Cruix
0b7f816033 Added a new ability to sentient diseases 2018-03-31 06:14:54 -05:00
Robustin
b26868a6b7 Get_Flat_Human_Icon no longer draws asses that nobody wants (#36781) 
* Argument to limit excess icon work

* 50% less icon for your icon

* 75% less icon for your icon

* Correction

* statics the list, tweaks a default arg

* Cardinal argument list

* correct GLOB name
 2018-03-31 06:13:28 -05:00
LetterJay
2e552042c5 Merge pull request #6136 from Citadel-Station-13/upstream-merge-36752 
[MIRROR] Adds an admin follow link to revenant spawns
 2018-03-31 06:13:22 -05:00
Davidj361
60091c50b5 Fixes "ocular wardens don't target buckled mobs" (#36628) 
* Ocular wardens now shoot handcuffed and buckled, but not if they're spelled handcuffed.

* Clock cultists can spell cuff sec cuffed carbon mobs, so the ocular doesn't shoot them.

* Added in review suggestions

* More oversight
 2018-03-28 13:42:59 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00