Commit Graph

105 Commits

Author SHA1 Message Date
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
deathride58
bcfa9a0010 Disables changeling team objectives - we almost always just delete team objectives anyways (#8010) 2019-02-22 06:10:20 -08: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
Cameron!
8a989d2afe Quartermaster can no longer be a changeling or traitor (#7062)
* Quartermasters can no longer be changelings

Consistency with heads of staff not being antagonists.

* oops forgot this

Thanks Glitchy
2018-06-11 13:40:19 -07:00
LetterJay
fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868)
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
2018-06-05 23:12:55 -07:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -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
LetterJay
072056f919 Update fleshmend.dm 2018-01-24 15:40:05 -06:00
Ashe Higgs
be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
F-OS
9c8959f2ff Last resort now requires a confirmation. (#33947)
* Update headcrab.dm

* fixed

* fuck

* Update headcrab.dm

* Update headcrab.dm
2017-12-31 02:24:53 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
ShizCalev
3ea4e84719 Fixes deleting handcuffs (#33821)
* Fixes deleting handcuffs

* cleanup
2017-12-26 00:13:13 -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
Jordan Brown
2a80a2d6fb Merge pull request #33728 from kevinz000/patch-408
Fixes biodegrading handcuffs
2017-12-23 08:27:09 -06:00
LetterJay
56ecc13289 Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
LetterJay
cb8c6cd5e2 Update changeling.dm 2017-12-19 15:34:38 -06:00
Leo
4e5671960d Merge pull request #33651 from coiax/absorb-language
Changelings learn languages from people they absorb
2017-12-19 07:55:57 -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
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -06: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
7b244b40fb Update changeling.dm 2017-11-17 23:25:20 -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
f45515eaee Update transform.dm 2017-11-07 03:28:38 -06:00
LetterJay
a60582c37e Update revive.dm 2017-11-07 03:28:25 -06:00
LetterJay
4b676044f2 Update mimic_voice.dm 2017-11-07 03:28:14 -06:00
LetterJay
bfecaaaac0 Update humanform.dm 2017-11-07 03:28:05 -06:00
LetterJay
c593d25ae2 Update hivemind.dm 2017-11-07 03:27:48 -06:00
LetterJay
8daeb7bb75 Update fakedeath.dm 2017-11-07 03:27:37 -06:00
AnturK
2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
deathride58
226c420f39 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into IHAVENOIDEAWHATTHEFUCKIMDOING 2017-11-02 17:45:32 -04:00
deathride58
6f5b14ef81 fixes indentation 2017-10-26 23:51:35 -04: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
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -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
CitadelStationBot
e827f02863 [MIRROR] Fixes various spelling and grammar errors. (#3436)
* Fixes various spelling and grammar errors.

* Update crashedship.dm

* Update listeningstation.dm

* Update augments_chest.dm

* Update augments_chest.dm
2017-10-21 07:10:23 -05:00
CitadelStationBot
dd735fb2eb [MIRROR] Makes changelings vomitting acid on things actually leave a puddle of acid (#3522)
* Changeling vomit (#31878)

* Makes changelings vomitting acid on things actually leave a puddle of acid
2017-10-21 06:15:06 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161)
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00