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
Poojawa
7d65ddb417
bug blood, ipc/slime hearts, blood gen protolathe
...
we're all gucchi now boys
2019-08-04 04:07:44 -05:00
Chayse Ramsay
d3620c5894
Merge branch 'Helmet-Internals' of https://github.com/jakeramsay007/Citadel-Station-13 into Helmet-Internals
2019-08-04 05:49:10 +01:00
Chayse Ramsay
f9d829b111
Proc to define
2019-08-04 05:48:08 +01:00
Chayse Ramsay
5e757f1012
Update code/modules/mob/living/carbon/life.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-08-04 05:26:16 +01:00
Chayse Ramsay
0a7054c604
Update code/modules/mob/living/carbon/inventory.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-08-04 05:26:02 +01:00
Chayse Ramsay
46e4023ba9
Monkey business
2019-08-04 05:07:24 +01:00
Sishen
1f100f1f3b
crush my lock with a rock i must
2019-08-03 18:48:14 -04:00
Poojawa
d0d6bc37a6
Merge branch 'master' into job-menu-improvements
2019-08-02 11:55:28 -05: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
Poojawa
ec90505881
neyh
2019-08-01 11:06:03 -05:00
Poojawa
c8d7f1909d
holy FUCK I got gib overlays working. Why wasn't it before?
...
No one will ever know.
2019-08-01 00:58:24 -05:00
Ghommie
5ee9b4d4f4
part 1 plasmaman stuff.
2019-08-01 06:58:21 +02:00
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
