Commit Graph

16414 Commits

Author SHA1 Message Date
Poojawa
6db4cbf8b0 itsworking.avi 2019-08-04 01:32:51 -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
CameronWoof
900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" 2019-08-03 20:37:02 -07:00
Sishen
1f100f1f3b crush my lock with a rock i must 2019-08-03 18:48:14 -04:00
Chayse Ramsay
a0a21dc01f !iscarbon to !ishuman 2019-08-03 18:36:46 +01:00
EgoSumStultus
464a589c25 *sobbing noises* 2019-08-03 07:34:32 -07:00
kevinz000
1c1ca84c3a Update miscellaneous.dm 2019-08-03 00:49:57 -07:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
kevinz000
8cfba8e2ce Update misc_walls.dm 2019-08-03 00:46:24 -07:00
EgoSumStultus
b3b8d71cc7 huuhuh... HUUuhuhuhh.... 2019-08-02 22:41:01 -07:00
EgoSumStultus
b208a475ef huuhhuuhuhh.... 2019-08-02 21:37:56 -07:00
TrilbySpaceClone
3a85f9473c amazing 2019-08-02 14:37:52 -04:00
Poojawa
d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
EgoSumStultus
50ea3970f6 huhuhuhuguhuuhh... 2019-08-02 09:25:38 -07:00
EgoSumStultus
45655c65f3 HUHUUGGUUHUHHUHUHHhhh... 2019-08-02 08:32:49 -07:00
EgoSumStultus
7f3e5ad3d0 AAUUGUGGHHHGHUGHUGHHH!! 2019-08-02 08:07:00 -07:00
EgoSumStultus
6b72e04708 HUFF HUFF HUFf... 2019-08-02 07:38:40 -07:00
EgoSumStultus
4de05fc692 AAAAAAAAAAAAHHHHHHHHHHH 2019-08-02 06:48:14 -07:00
EgoSumStultus
5814ab7e8f BRRREEEEEEEEEEEEEEEEEEEEE 2019-08-02 06:23:02 -07:00
kevinz000
d5b0104a3e Update miscellaneous.dm 2019-08-02 05:46:49 -07: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
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
2019-08-02 00:57:05 -07:00
kevinz000
5fdd0b82dd Merge pull request #9008 from Linzolle/kravmaga
fix krav maga leg sweep
2019-08-02 00:55:34 -07:00
kevinz000
eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator
Alert Level is now displayed at the job selection screen.
2019-08-02 00:55:18 -07:00
kevinz000
dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201
Ports "Gauze can now be applied to corpses #44199"
2019-08-02 00:54:57 -07:00
kevinz000
caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204
Fixes Pound and hardware cake
2019-08-01 23:29:27 -07:00
kevinz000
b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun
Makes a new traitor Emitter gun for Engi memes
2019-08-01 23:29:10 -07:00
kevinz000
20f912df49 Merge pull request #8953 from Michiyamenotehifunana/Rapid-Resprite-Service
Resprites RCDs and RPDs
2019-08-01 23:28:21 -07:00
kevinz000
84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting
Hallucination Sting Buffs
2019-08-01 23:26:37 -07:00
kevinz000
0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf
REMOVES SHIELF
2019-08-01 23:25:52 -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
657d3528e2 some good work here 2019-08-01 17:35:37 -05:00
Ghommie
35b4525cc6 undefined proc 2019-08-01 19:51:22 +02:00
Ghommie
0297d8c3e6 helmet laziest spriting complete. 2019-08-01 19:44:41 +02:00
Poojawa
1893a8f319 correctly copy/pasta's the chaplain stuff 2019-08-01 11:14:50 -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
6059db6a3b missed 2019-08-01 07:07:20 +02:00
Ghommie
5ee9b4d4f4 part 1 plasmaman stuff. 2019-08-01 06:58:21 +02:00
CameronWoof
397b33f0b2 Fixes a bug no one here will ever run into 2019-07-31 21:00:45 -07:00
Poojawa
dc3f178e65 Improves vore sound efficency
Also ghosts won't be able to hear any sounds or see any messages at all anymore.
2019-07-31 22:12:08 -05: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