shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,978 Commits 5 Branches 0 Tags
166370fb6c62beb8cc8488710c9ffbf9c511ff1c
Commit Graph

348 Commits

Author SHA1 Message Date
kevinz000
03d87f6bdc Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-29 20:44:49 -07:00
kevinz000
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
kevinz000
8f26325822 more stuff 2020-01-26 21:05:51 -07:00
kevinz000
7471f59bc3 ignore eligibility checks 2020-01-26 13:56:04 -07:00
kevinz000
01152d6d0f traitor items 2020-01-26 00:41:58 -07:00
kevinz000
9ee9f79fdc checks 2020-01-25 23:52:33 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Ghommie
13f65c028f Moves some clockie paper info to the right file. 2019-11-20 01:19:05 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
a18bcd05d7 makes it compile. 2019-11-12 02:38:45 +01:00
Ghommie
388a7579b9 A few minor clock cult improvements. 2019-11-12 01:49:36 +01:00
Sishen
dab0829da8 normalizes head roles not rolling the more common antags (wiz is kept) 2019-09-06 04:50:20 -04:00
kevinz000
9ec56077b6 Merge pull request #8908 from Ghommie/Ghommie-cit142 
Fixes Zelus flasks a bit.
 2019-08-05 00:54:43 -07:00
kevinz000
a105ba4bb6 Merge pull request #8774 from Sishen1542/monkeycult 
Removes the human check from cap/chap mind on cult conversion.
 2019-08-05 00:47:04 -07:00
Ghommie
75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02:00
Trilbyspaceclone
d53d11de6b Apply suggestions from code review 
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-10 18:21:03 -04:00
TrilbySpaceClone
54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Sishen
05a55bcb30 Update clock_cult.dm 2019-07-02 17:24:46 -04:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
dtfe3
f56960ff88 Fract said max 35 2019-05-27 00:39:48 +02:00
dtfe3
38a6c1f917 Decreased the increase from 45 to 40 2019-05-27 00:22:50 +02:00
dtfe3
745df721ba CWC player requirement increase 
Player requirement increase from 30 to 45

well basically most people dislike CWC in lowpop and it's generally unbalanced during lowpop so let's just not have it happen during lowpop. Easy fix!
 2019-05-26 23:20:27 +02:00
kevinz000
8b3d4c3da1 Update clock_cult.dm 2019-03-16 15:48:28 -07:00
kevinz000
696625f7b8 Update clock_cult.dm 2019-03-16 15:47:19 -07:00
deathride58
f16be92e26 Merge pull request #7990 from Avunia/playernumberchecks 
Making player requirement for some gamemodes slightly lower so that they actually appear in the game.
 2019-02-22 13:05:10 -05:00
Alexander Meinhardt
b45b6efea7 Reduced req. enemies on BC and CC to 2 2019-02-21 03:49:50 +01:00
Cyprian
1a87a00893 Reverting the changes for team numbers. Lowering clock cult requirement to 20 aswell now that it won't conflict with the PR about fixes to clockcult 2019-02-14 12:24:10 +01:00
Coolgat3
f7b1304d57 Fixes clockcult to be actually playable on citadel. (#7982) 
* Some fixes

* Buffed vanguard to grant infinite stamina to actually make you immune to stuns

* Fixed the comment to not say infinite stun immunity cause that looked scary and bugged me lmao

* Revert "Buffed vanguard, infinite stam"

This reverts commit 8290e5bc4050f7c6476cde3dafb327bf93d49ef3 and
105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Revert "Buffed vanguard to grant infinite stamina to actually make you immune to stuns"

This reverts commit 105d6c1cf74b84b182b26683dcad985fbe7ead4a.

* Fixed vanguard and trying to fix reebe getting the reebe ztrait

* Git is hard. Fix.

* Vanguard buffs

* Git ate the credits
 2019-02-13 20:47:57 -08:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
KorPhaeron
4b38136d79 Only load Reebe during clock cult (#38156) 
* Only load clock cult during clock cult

* Return FALSE
 2018-06-03 09:02:55 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -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
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
YPOQ
42372b8d04 Fixes eminences not being recognized as servants of ratvar (#37070) 
* Fixes eminences not being recognized as servants of ratvar

* Readds istype check
 2018-04-10 20:21:37 -05:00
AlexTheSysop42
360eb223b3 Adds check to keep observers from being recognized as servants of ratvar (#36800) 
* Comments out code to try to fix a bug

* fixes servant ghosts being trapped on Reebe

* protip: next time don't commit to master

* ghosts no longer count as servants

* Undoes ghost check, moved to is_servant_of_ratvar

* change istype to isliving
 2018-03-31 06:17:10 -05:00
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
Dax Dupont
643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866) 
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
 2018-01-27 23:21:48 -06:00
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06:00
LetterJay
f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -06:00
LetterJay
ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -06:00