 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
|
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 |
|
|
Ghommie
|
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 |
|
|
Ghommie
|
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 |
|
|
Carlen White
|
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 |
|
|
Carlen White
|
3504f15c01
|
Travis Bump
|
2019-07-14 20:29:23 -04:00 |
|
|
kevinz000
|
628244c0ba
|
Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
|
2019-07-14 14:49:11 -07:00 |
|
|
kevinz000
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
|
kevinz000
|
b153294a24
|
Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
|
2019-07-14 03:38:45 -07:00 |
|
|
Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
|
Fermi
|
110f0cbb83
|
Fixes and making a message clearer so people don't think it's admins.
|
2019-07-13 19:17:19 +01:00 |
|
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
|
kevinz000
|
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 |
|
|
kevinz000
|
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 |
|
|
Ghommie
|
bef0027287
|
In a haste, we forget thousand things.
|
2019-07-11 08:50:47 +02:00 |
|
|
Ghommie
|
081c07098f
|
randomizing colors.
|
2019-07-11 08:08:07 +02:00 |
|
|
Ghommie
|
143410c176
|
Blame Poojawa for the issue.
|
2019-07-11 07:39:29 +02:00 |
|
|
Poojawa
|
c4f736eb94
|
Merge branch 'master' into job-menu-improvements
|
2019-07-10 18:55:29 -05:00 |
|
|
Fermi
|
8f555b0fdd
|
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
|
2019-07-10 21:35:47 +01:00 |
|
|
Fermi
|
ce390fb595
|
Tweaks to MK
|
2019-07-09 23:27:37 +01:00 |
|
|
Ghommie
|
ba7c24a0ec
|
Refactoring underwear to allow custom color preferences.
|
2019-07-09 23:25:54 +02:00 |
|
|
Fermi
|
c12c5be2b6
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-09 20:36:19 +01:00 |
|