Fermi
|
ee1b04eefb
|
Fixes potential "trapped as ghost" problems and examine+scanner text
|
2019-08-06 19:54:07 +01:00 |
|
Fermi
|
f4c5e6fd2f
|
Attempts to deal with the potential future problem of people stunlocking
|
2019-08-06 16:43:55 +01:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
kevinz000
|
f1c9a07f6d
|
Merge pull request #8912 from Ghommie/Ghommie-cit146
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
|
2019-08-04 22:41:49 -07:00 |
|
kevinz000
|
489b4c78dc
|
Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
|
2019-08-04 19:19:19 -07:00 |
|
kevinz000
|
5cfb7ef49d
|
Merge pull request #8999 from BurgerLUA/Xeno-Nerf-part-1-out-of-20
Xenomorph larvae no longer gib and inexplicably delete your brain when hatching
|
2019-08-04 19:18:53 -07:00 |
|
kevinz000
|
8452cf3b8a
|
Merge pull request #9014 from Ghommie/Ghommie-cit170
undergarment fixes.
|
2019-08-04 19:13:21 -07:00 |
|
kevinz000
|
f8dbe71bf7
|
Merge pull request #9035 from Poojawa/vore-toggle-fix
Fixes a runtime with a simple mob verb
|
2019-08-04 19:12:57 -07:00 |
|
kevinz000
|
53a9f3ac51
|
Merge pull request #9036 from Linzolle/invisiclothes
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
|
2019-08-04 19:09:36 -07:00 |
|
kevinz000
|
4dcdf7ac4d
|
Merge pull request #9044 from Sishen1542/rock-lock
Adds the ability to construct and deconstruct locker locks
|
2019-08-04 19:07:35 -07:00 |
|
kevinz000
|
27b3cb6656
|
Merge pull request #9018 from Ghommie/Ghommie-cit171
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-08-04 19:04:59 -07:00 |
|
Sishen
|
1f100f1f3b
|
crush my lock with a rock i must
|
2019-08-03 18:48:14 -04:00 |
|
kevinz000
|
eca34a6552
|
Merge pull request #8994 from Ghommie/Ghommie-cit164
Makes staminaloss also apply the oxyloss fullscreen overlay.
|
2019-08-02 01:43:46 -07:00 |
|
Linzolle
|
bc9bca8d04
|
oh my god
|
2019-08-02 01:20:32 -05:00 |
|
Poojawa
|
b5fcaf20e6
|
Fixes a runtime with a simple mob verb
|
2019-08-01 17:40:43 -05:00 |
|
Fermi
|
18b03f9053
|
Furranium fixes.
|
2019-08-01 03:38:06 +01: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 |
|
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
|
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 |
|
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 |
|
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 |
|