d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
6f33856ae7
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-07-28 18:51:19 +02:00
5055cd73b9
Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
...
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
bf137a60a7
Update mob.dm
2019-07-28 03:26:17 -07:00
c8d2410f0e
Merge pull request #8961 from Citadel-Station-13/kevinz000-patch-58
...
Fixes subtler anti ghost
2019-07-28 02:32:42 +12:00
4a6982658f
true
2019-07-26 22:04:21 -04:00
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
1adaf01839
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-26 22:55:46 +02:00
99720f12e5
makes slimepeople like toxic food
2019-07-25 20:55:18 -05:00
1a92134ad3
b
2019-07-25 21:43:02 -04:00
d976dd016a
Merge remote-tracking branch 'origin/master' into trait_blacklisting
2019-07-25 15:20:46 -07:00
c3e4fa8802
Update facehugger.dm
2019-07-25 13:32:42 -04:00
896ca8b272
Update support.dm
2019-07-25 00:56:00 -07:00
e65d51f493
Update say_vr.dm
2019-07-24 17:31:24 -07:00
eef852aa9a
Update mob.dm
2019-07-24 17:10:44 -07:00
8c6b1c8e95
Update say_vr.dm
2019-07-24 17:05:20 -07:00
969aaad3d1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
2019-07-24 17:35:29 +02:00
0f58585e5d
Merge pull request #8939 from Ghommie/Ghommie-cit154
...
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
1028fe458a
Merge pull request #8909 from Ghommie/Ghommie-cit143
...
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
f114094138
Merge pull request #8926 from Thalpy/Secbats
...
Secbats
2019-07-22 20:15:36 -07:00
e8584720b3
Fixes suit worn overlay for towels.
2019-07-21 11:18:38 +02:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
e5648fd471
Made bat part of previous bat type.
2019-07-19 22:57:22 +01:00
b87442e633
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-07-19 20:09:16 +02:00
4ab5060596
Adds secbats (tested)
2019-07-19 17:07:02 +01:00
7a0afda173
Cat patially, MK partially.
2019-07-19 16:19:42 +01:00
fbf542134a
Cidadel makes me want to hurt myself.
2019-07-19 05:18:35 +01:00
a5fcb918aa
Astrogen tweaks and cat fixes.
2019-07-19 04:11:26 +01:00
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
b6f10c96a7
Modularity was a mistake.
2019-07-16 21:05:12 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
fac3e65c68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
2019-07-15 17:42:47 +02:00
1e1f8e627f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
2019-07-15 17:33:41 +02:00
4df4cbd721
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-07-15 17:23:01 +02:00
bb81a0850b
Merge branch 'master' into batch-check-injuries
...
# Conflicts:
# code/modules/mob/living/carbon/human/human_defense.dm
2019-07-14 20:49:52 -04:00
3504f15c01
Travis Bump
2019-07-14 20:29:23 -04:00
628244c0ba
Merge pull request #8869 from Ghommie/Ghommie-cit129
...
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
2ec5d3f02e
Merge pull request #8886 from Ghommie/Ghommie-cit137
...
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-14 14:05:20 -07:00
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
b153294a24
Merge pull request #8857 from Ghommie/Ghoomie-cit127
...
Refactoring underwear to allow custom color preferences.
2019-07-14 03:38:45 -07:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
110f0cbb83
Fixes and making a message clearer so people don't think it's admins.
2019-07-13 19:17:19 +01:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
53642c5104
Merge pull request #8842 from UristMcAstronaut/master
...
allows pais to activate holoform while in a pai connector
2019-07-12 07:36:48 -07:00
1eaddd3ebf
Merge pull request #8853 from Ghommie/Ghommie-cit125
...
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
2019-07-12 07:34:19 -07:00
bef0027287
In a haste, we forget thousand things.
2019-07-11 08:50:47 +02:00
081c07098f
randomizing colors.
2019-07-11 08:08:07 +02:00
Fermi