Fermi
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
Poojawa
58a27fa082
tabby boi
2019-07-31 19:37:53 -05:00
Poojawa
1d5e21d137
ok
2019-07-31 19:35:27 -05:00
Poojawa
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
Poojawa
218cbe2dbc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-31 19:09:35 -05:00
BurgerLua
c0698bd220
whitespace
2019-07-31 16:40:49 -07:00
BurgerLua
3baac83021
Added
2019-07-31 16:40:35 -07:00
Ghommie
ec2a3ea778
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
2019-07-31 18:56:00 +02:00
Ghommie
397c62bf7a
undergarment fixes.
2019-07-31 16:19:25 +02:00
Fermi
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
kevinz000
26c195dec8
Merge pull request #8971 from Linzolle/toxiclover
...
makes slimepeople like toxic food
2019-07-29 04:39:12 -07:00
kevinz000
11628431b4
Merge pull request #8976 from Ghommie/Ghommie-cit157
...
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-29 04:38:14 -07:00
BurgerLua
cdb45a2ae0
Added
2019-07-28 21:37:49 -07:00
Ghommie
4ef1413342
dupe icons instead of snowflake vars.
2019-07-29 04:50:12 +02:00
Ghommie
2b224400e3
Adds in worn overlays for different types of cuffs.
2019-07-29 04:31:27 +02:00
Fermi
d080446a77
Merge branch 'pr/20'
2019-07-28 23:28:19 +01:00
Ghommie
6f33856ae7
Makes staminaloss also apply the oxyloss fullscreen overlay.
2019-07-28 18:51:19 +02:00
Chayse Ramsay
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
kevinz000
bf137a60a7
Update mob.dm
2019-07-28 03:26:17 -07:00
BlackMajor
c8d2410f0e
Merge pull request #8961 from Citadel-Station-13/kevinz000-patch-58
...
Fixes subtler anti ghost
2019-07-28 02:32:42 +12:00
Trilbyspaceclone
4a6982658f
true
2019-07-26 22:04:21 -04:00
Poojawa
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
Ghommie
1adaf01839
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-26 22:55:46 +02:00
Linzolle
99720f12e5
makes slimepeople like toxic food
2019-07-25 20:55:18 -05:00
Sishen
1a92134ad3
b
2019-07-25 21:43:02 -04:00
kevinz000
d976dd016a
Merge remote-tracking branch 'origin/master' into trait_blacklisting
2019-07-25 15:20:46 -07:00
Trilbyspaceclone
c3e4fa8802
Update facehugger.dm
2019-07-25 13:32:42 -04:00
kevinz000
896ca8b272
Update support.dm
2019-07-25 00:56:00 -07:00
kevinz000
e65d51f493
Update say_vr.dm
2019-07-24 17:31:24 -07:00
kevinz000
eef852aa9a
Update mob.dm
2019-07-24 17:10:44 -07:00
kevinz000
8c6b1c8e95
Update say_vr.dm
2019-07-24 17:05:20 -07:00
Ghommie
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
kevinz000
0f58585e5d
Merge pull request #8939 from Ghommie/Ghommie-cit154
...
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
kevinz000
1028fe458a
Merge pull request #8909 from Ghommie/Ghommie-cit143
...
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
kevinz000
f114094138
Merge pull request #8926 from Thalpy/Secbats
...
Secbats
2019-07-22 20:15:36 -07:00
Ghommie
e8584720b3
Fixes suit worn overlay for towels.
2019-07-21 11:18:38 +02:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
kevinz000
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
Fermi
e5648fd471
Made bat part of previous bat type.
2019-07-19 22:57:22 +01:00
Ghommie
b87442e633
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-07-19 20:09:16 +02:00
Fermi
4ab5060596
Adds secbats (tested)
2019-07-19 17:07:02 +01:00
Fermi
7a0afda173
Cat patially, MK partially.
2019-07-19 16:19:42 +01:00
Fermi
fbf542134a
Cidadel makes me want to hurt myself.
2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa
Astrogen tweaks and cat fixes.
2019-07-19 04:11:26 +01:00
Ghommie
4e6554076c
item flags, not clothing flags.
2019-07-18 00:16:14 +02:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
Ghommie
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
Ghommie
b6f10c96a7
Modularity was a mistake.
2019-07-16 21:05:12 +02:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
Ghommie
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
