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

126 Commits

Author SHA1 Message Date
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
Leo
b543882c64 Merge pull request #35025 from vuonojenmustaturska/toot 
Warp whistle now respects notransform
 2018-01-28 15:08:33 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
deathride58
f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185 
[MIRROR] Fixes feedback spell level var
 2018-01-10 19:56:30 +00:00
Leo
56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining 
Late joiners also get summoned guns/magic
 2018-01-10 03:11:56 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
Dax Dupont
d057f55ed4 Makes the chaplain's soulshard require death (#34125) 2018-01-07 20:56:24 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
7d193a5303 Update wizard.dm 2017-12-19 15:35:57 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
f57e02ce95 Merge branch 'master' into donoritemmodularization 2017-12-04 20:17:02 -05:00
deathride58
34c9105396 Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129 
[MIRROR] Adds a new wizard magic suicide.
 2017-11-29 03:29:37 +00:00
Shadowflame909
5bc059fbc8 Update artefact.dm (#33129) 
Beep Beep more hard to get suicides are fun!
 2017-11-28 19:06:24 -06:00
ACCount
b15481c7cd Removes some unused sprite files (#33121) 
* Removes two unused sprite files

* Removes two more sprites
 2017-11-28 06:28:23 -06:00
deathride58
c4b3b99c99 Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087 
[MIRROR] Cleans up some qdel(src)'s in Initialize()
 2017-11-27 02:37:07 +00:00
ShizCalev
5abd1bcdd9 Cleans up some qdel(src)'s in Initialize() 2017-11-26 20:15:18 -06:00
AnturK
c574b06f90 Fixes wizard greentext (#33088) 2017-11-26 16:53:58 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58
b6630b41d1 merges #3877 proper 2017-11-22 17:37:22 -05:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
c2864b3b8b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING 2017-11-20 00:21:38 -05:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
eea00b4d85 Update wizard.dm 2017-11-17 23:29:09 -05:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
deathride58
862baf67db this is probably gonna break shit, hopefully this fixes the issue during a testmerge 2017-10-26 23:33:37 -04:00
CitadelStationBot
deaec38579 [MIRROR] Fixes shades hearing heartbeats (#3599) 
* Merge pull request #32059 from ShizCalev/shade-heartbeat

Fixes shades hearing heartbeats

* Fixes shades hearing heartbeats
 2017-10-25 20:02:09 -05:00
LetterJay
000f1c89a3 Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935 
[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-22 12:25:42 -04:00
Jordan Brown
17d2ff88c5 Merge pull request #31935 from ShizCalev/shade-qdel-fix 
Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
 2017-10-21 18:53:50 -05:00
AnturK
ea4fc92dae Fixes wizard roundend with liches around 2017-10-21 16:21:39 -05:00
AnturK
daeffc5b03 Fixes liches not blocking roundend properly. (#31851) 2017-10-18 18:27:14 -05:00
AnturK
f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
deathride58
7ca2bd48a5 Crew objectives no longer count towards antags greentexting 2017-10-06 09:56:42 -04:00
Leo
dec28eabfc Merge pull request #31287 from ShizCalev/wizard-name 
Correctly applies wizard names
 2017-10-04 19:26:31 -05:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887 
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
 2017-10-04 19:06:02 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117 
[MIRROR] Fixes liches losing spells
 2017-10-01 15:42:12 -04:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00