shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

14703 Commits

Author SHA1 Message Date
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 de675a10e7 Merge pull request #9025 from Poojawa/patch-1 
Actually fixes Vore sounds for real this time
 2019-08-04 19:08:16 -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
Fermi ffa717e8d7 Prevents Eigenlockers from teleporting people to CC via cargoshuttle. 2019-08-04 19:39:14 +01:00
Sishen 51943d4c75 dduhhhhhhhd duurrrrrrrr 2019-08-04 04:56:55 -04: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
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
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
BurgerLua c0698bd220 whitespace 2019-07-31 16:40:49 -07:00
BurgerLua 3baac83021 Added 2019-07-31 16:40:35 -07:00
Poojawa 8c24cb519b Likely fixes vore sounds 
Bhjin man bad
 2019-07-31 18:30:57 -05:00
Ghommie a9b16701a1 Ports "Lizardwine drink crafting fix" 2019-08-01 00:31:14 +02:00
Ghommie ec560c8371 Ports "More robust dorfs." 2019-07-31 22:14:39 +02:00