Commit Graph

170 Commits

Author SHA1 Message Date
Robustin 1825c944b6 Cult Update? Cult Update! (#35433)
* Cult Fixes and Tweaks

* Master prompt and spelling fix

* Couple small fixes
2018-02-12 15:18:21 -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 aa04e62b29 cult lol xd 2018-01-31 08:07:22 -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 326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob
Fixes invalid pollCandidatesForMob args
2018-01-23 06:42:08 -06:00
Iamgoofball e862c1138e >people think burn victims are better than literally-cant-see-shit (#34734) 2018-01-22 13:06:32 -06:00
ShizCalev 68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
AnturK 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58 400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096
[MIRROR] Cult will actually report victories now
2018-01-10 19:57:56 +00:00
Robustin 1bd84a8f6b Cult will actually report victories now (#34096)
* Cult victory fix

* Update cult.dm

* Correct cult victory report
2018-01-10 03:46:55 -06:00
Jordan Brown cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop
Fixes non-cultist hulks being able to hold cult bbs
2018-01-10 03:13:02 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
Jordan Brown 1d235c0a72 Merge pull request #34031 from ShizCalev/narsie-summons
Prevents Nar-Sie from being double-summoned
2018-01-03 12:25:35 -06:00
LetterJay a160997587 Update talisman.dm 2017-12-30 13:32:02 -06:00
LetterJay a8d6fa7fd7 Update runes.dm 2017-12-30 13:31:51 -06:00
LetterJay 6c59d4134a Update ritual.dm 2017-12-30 13:31:24 -06:00
Tad Hardesty 0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
LetterJay 2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown 164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -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
XDTM 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Robustin 685bf8b48c Both cult revive runes will now replace braindead/AFK cultists (#33206)
* "Revive" AFKs

* "Revives" inactive clock cultists

* AFK boot notice

* Missing parenthesis

* Revive targets correct mob

* Poll fix

* Fixes inactive revive mob

* Suicide Counter
2017-12-12 13:48:18 -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
ShizCalev 2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
deathride58 eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00: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
Robustin bd0cbee581 Cult pop scaling refactor (#32598) 2017-11-14 07:44:28 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
imsxz 705ade984a Make cult hardsuit bulky sized (#32359) 2017-11-05 12:05:01 -06:00
LetterJay c0293df7e0 Merge pull request #3794 from Citadel-Station-13/upstream-merge-32339
[MIRROR] You can no longer disturb the floor with visions of madness
2017-11-04 22:48:50 -05:00
MoreRobustThanYou 4e6435e4b7 You can no longer disturb the floor with visions of madness (#32339)
* You can no longer disturb the floor with visions of madness

* Add failure message

* Deletes uneeded line
2017-11-03 18:54:49 -05:00
KorPhaeron 7b46801c35 Prints out cultist names at round end (#32355) 2017-11-03 15:53:42 -05:00
MoreRobustThanYou 41893fc147 Spamming runes / battlecries / etc will no longer trigger spam prevention (#32303)
* Update say.dm

* Update runes.dm

* Update standard.dm

* Update ratvarian_language.dm
2017-11-02 04:13:18 -05:00
Jordan Brown 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
LetterJay 0ee34c7b3d Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662
[MIRROR] Removes unused list
2017-10-14 15:41:09 -04:00
AnturK f6f114af12 Removes unused list (#31662) 2017-10-14 00:50:35 -05:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Tad Hardesty 01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
LetterJay a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
Neri 4bc4ab7fc5 Oh. That's what was missing. (#3143)
Boop.
2017-10-07 14:01:43 -07:00
Jordan Brown 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay c2d8f048f8 Update cult_items.dm 2017-10-04 21:49:46 -05:00
LetterJay 7c4373c1fe Update cult_items.dm 2017-10-04 21:15:11 -05:00