Commit Graph

69 Commits

Author SHA1 Message Date
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
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
MoreRobustThanYou
29ba71765c Datumizes saymodes 2017-12-03 12:56:03 -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
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
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
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Leo
a1ccf4adda Merge pull request #31513 from ShizCalev/file-cleanup
Cleans up empty file
2017-10-10 17:48:31 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
2017-10-01 16:29:13 -04:00
Leo
57b2a3618e Merge pull request #31132 from KorPhaeron/lingfix
Fixes changelings being able to transform sting mobs that are transform sting immune
2017-09-30 21:36:32 -05:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
LetterJay
0429a75e52 Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
msgerbs
d9abc21a9a Fixed changeling augmented eyesight ability (#30592)
* Fix changeling augmented eyesight

Fix not being able to toggle changeling augmented eyesight off again.

* Fix augmented eyesight

Fix changeling's augmented eyesight ability.

* Fix changeling augmented vision

Fix changeling augmented vision, for real this time. Makes it properly grant night vision on purchase, remove granted effects on refund, and properly toggle on and off. Note, this changes it to x-ray vision, to replicate the way it has been working for well over a year.
2017-09-11 18:38:16 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
kevinz000
3254fcf535 goddamnit_again (#2511) 2017-08-26 18:43:57 -07:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
cef534face Update mutations.dm 2017-08-21 23:31:55 -05:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
cc7ad81f79 Adds helpers to avoid << use 2017-08-08 22:28:16 -05:00
CitadelStationBot
dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -05:00
kevinz000
bbcad2fa58 Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)"

This reverts commit 44742cb115.

* Delete shuttle_loan.dm.rej

* Delete life.dm.rej

* Update life.dm

* Delete life.dm.rej

* compile
2017-07-31 23:41:22 -07:00
CitadelStationBot
3085776125 Reviving Stasis now always regenerates all organs 2017-07-21 18:18:45 -05:00
kevinz000
44742cb115 im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)
* Revert "Automatic changelog generation for PR #2021 [ci skip]"

This reverts commit 9d0cd37dd3.

* Revert "Disease Refactor (#2021)"

This reverts commit f2ac487927.
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927 Disease Refactor (#2021) 2017-07-15 11:40:49 -07:00