2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
bd0cbee581
Cult pop scaling refactor ( #32598 )
2017-11-14 07:44:28 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
705ade984a
Make cult hardsuit bulky sized ( #32359 )
2017-11-05 12:05:01 -06:00
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
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
7b46801c35
Prints out cultist names at round end ( #32355 )
2017-11-03 15:53:42 -05:00
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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
0ee34c7b3d
Merge pull request #3383 from Citadel-Station-13/upstream-merge-31662
...
[MIRROR] Removes unused list
2017-10-14 15:41:09 -04:00
f6f114af12
Removes unused list ( #31662 )
2017-10-14 00:50:35 -05:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
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
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
4bc4ab7fc5
Oh. That's what was missing. ( #3143 )
...
Boop.
2017-10-07 14:01:43 -07:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
c2d8f048f8
Update cult_items.dm
2017-10-04 21:49:46 -05:00
7c4373c1fe
Update cult_items.dm
2017-10-04 21:15:11 -05:00
365adf852c
Merge branch 'master' into upstream-merge-31222
2017-10-04 21:50:07 -04:00
13cf0696e0
Merge branch 'master' into upstream-merge-31198
2017-10-04 19:06:42 -04:00
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
b2184c1a78
Update cult_structures.dm
2017-10-04 17:38:01 -05:00
5c49bab3c5
Merge pull request #31135 from KorPhaeron/unconvertable
...
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
4e648765db
Ports dash weapons to the dash datum
2017-10-03 18:11:42 -05:00
2e0513bb50
Fixes master
2017-10-01 00:52:23 -05:00
1a53d9e524
2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-01 00:02:04 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
9a4f84da5e
[MIRROR] Refactors roundstart centcom threat report. ( #2739 )
...
* Refactors roundstart centcom threat report.
* Update blob.dm
* Update changeling.dm
* Update traitor_chan.dm
* Update sandbox.dm
* Update traitor.dm
2017-09-13 22:50:01 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
16912124e5
Update ritual.dm
2017-09-11 15:54:38 -05:00
6b671ffd06
Update ritual.dm
2017-09-11 15:48:24 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
039aea1724
Merge pull request #2541
2017-08-29 22:39:48 -07:00
a0758720ce
Merge branch 'master' into upstream-merge-30251
2017-08-29 22:06:28 -07:00
8530808d72
wew
2017-08-29 22:06:14 -07:00
1dc4e09682
Merge branch 'master' into upstream-merge-30250
2017-08-29 20:04:01 -07:00
5f3775388c
Gives cult blades updated item and inhand sprites
2017-08-29 17:08:43 -05:00
b753909958
Cult ghosts can no longer be potentially deconverted or debrained
2017-08-29 10:25:31 -05:00
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
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
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
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
2241f5ecfb
Update cult_items.dm
2017-08-21 23:32:21 -05:00
ShizCalev