kevinz000
927b9d0622
Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
...
This reverts commit 3c5a3cb4d4109b15ebdd
2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4
Merge pull request #10883 from ancientpower/ghost-newscasters
...
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
ancientpower
5aecdb6a4d
initial commit
2020-02-03 20:10:39 -06:00
Ghom
d4aa410af0
Update atoms.dm
2020-02-02 23:18:30 +01:00
Ghom
6f66d76680
Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
...
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
kevinz000
32e4355024
lists are references use copy
2020-01-24 21:44:37 -07:00
kevinz000
24cbe67f27
optimizations, unnecessary crap, undocumented ipc change
2020-01-24 21:18:19 -07:00
Artur
255f2ce449
Testmerge Conflict fix?
2020-01-22 20:17:42 +01:00
Ghommie
c14439494a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
Ghommie
686a76dd1d
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2020-01-04 13:35:05 +01:00
Lin
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Ghommie
edd05cebea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-30 00:28:36 +01:00
Ghommie
e1949b0131
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-12-23 19:02:20 +01:00
Ghommie
9db79ff958
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-20 23:40:21 +01:00
Ghommie
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
Ghommie
80402a0d88
Ports some hud and update_icon code updates.
2019-12-16 23:29:20 +01:00
Ghommie
a9335aa946
Fixes a long lasting runtime with filter data sorting.
2019-12-08 13:21:29 +01:00
Ghommie
542c9007ee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-06 20:09:35 +01:00
Ghommie
af0110db40
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
2019-11-27 21:16:20 +01:00
Ghommie
4e05c27cdb
Updating supply pods code.
2019-11-27 01:54:10 +01:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
GrayRachnid
c8e52fb8e1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs
2019-11-22 15:24:15 -05:00
Ghommie
21f15e411d
Part 3
2019-11-19 19:34:42 +01:00
Ghommie
a52e292cc8
Ports "examine-code refactor"... part 1...
2019-11-19 03:28:06 +01:00
Ghommie
6e9d2d57c0
check_shields from human to living, part 2
2019-11-17 22:06:19 +01:00
Ghommie
6484eea339
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-15 00:36:50 +01:00
kevinz000
6909857e04
Merge pull request #9632 from Ghommie/Ghommie-cit281
...
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie
4ef1d64356
PR #47500 , #47501 , #47557 , #47588 .
2019-11-12 19:00:45 +01:00
Ghommie
09860d463f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-11-10 23:23:36 +01:00
Ghommie
1e49ce76d3
Dreamchecker compatibility changes, part 1.
2019-11-10 20:48:30 +01:00
Ghommie
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
kevinz000
fb936a5319
Merge pull request #9598 from deathride58/runtimefixpass
...
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
2019-10-29 21:41:11 -07:00
Ghommie
5fcf5b1c5e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-10-29 13:38:16 +01:00
Ghommie
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
Ghommie
2c578ca683
Ports move force and move resist, movement/pushing/pulling tweaks & co.
2019-10-24 18:01:46 +02:00
Ghommie
a50606bb67
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
2019-10-24 10:10:07 +02:00
deathride58
0ae8953da9
various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works
2019-10-24 02:52:40 -04:00
deathride58
724e4305e1
Fixes examinetext of mobs not actually showing when items are bloodstained by making get_examine_name() properly take blood-stained status into account
2019-10-23 21:08:59 -04:00
Ghommie
e1928a18f1
Porting GetComponent macros removal, and some related changes.
2019-10-23 15:04:28 +02:00
Poojawa
d6e28180a1
if this doesn't work, I won't be fixing it
2019-10-22 00:34:25 -05:00
GrayRachnid
9f8ad74bf9
New traumas and some other things.
2019-10-08 03:53:01 -04:00
Poojawa
ee5155bdbb
fixes oddities
2019-10-06 04:27:46 -05:00
Poojawa
b589565398
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-03 15:05:26 -05:00
Ghommie
d245a9d28d
addendum
2019-10-02 00:42:19 +02:00
Ghommie
81fc0c1b32
more foolproofing.
2019-10-02 00:37:02 +02:00
Ghommie
cfcd325778
reworking the shoving people action.
2019-10-01 23:13:08 +02:00
Poojawa
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
Poojawa
bdae9e051b
Fixes some errant issues with overlays
2019-08-26 14:15:55 -05:00
Poojawa
d60ba0a207
Fixes missing DNA info for slimes, resolves virology issues
2019-08-24 04:14:47 -05:00
