5009 Commits

Author	SHA1	Message	Date
Poojawa	d496e16dde	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements	2019-08-10 19:14:41 -05:00
kevinz000	40b89f49cc	Merge pull request #9078 from kappa-sama/moth1 ... Changes teleporter machines to apply flyperson (more) equally	2019-08-09 22:22:29 -07:00
kevinz000	b3b22029a6	Merge pull request #9064 from cebutris/hugloves ... Hugs of the North Star	2019-08-09 22:20:18 -07:00
kevinz000	74008beb8f	Merge pull request #9066 from Ghommie/Ghommie-cit181 ... Two lines fixes for invisible zipties and borked legcuffs.	2019-08-09 22:17:31 -07:00
kevinz000	14033d9876	Merge pull request #9085 from Ghommie/Ghommie-cit186 ... underwear colors fix 2: The revenge of the crunch.	2019-08-09 22:15:55 -07:00
Ghommie	ee57720ee3	underwear colors fix 2: The revenge of the crunch.	2019-08-09 05:11:12 +02:00
kappa-sama	a8e4ce1f77	Merge branch 'master' into moth1	2019-08-08 18:27:34 -04:00
Ghommie	a7287ed4d1	Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185	2019-08-08 23:11:58 +02:00
Ghommie	a9eeb28fff	Uncalibrated teleporters can now turn furries, scalies & co into flypeople too.	2019-08-08 21:09:11 +02:00
kappa-sama	2dc15b3fc0	Update teleporter.dm	2019-08-08 15:05:48 -04:00
kevinz000	290dfb8bbd	Merge pull request #9071 from YakumoChen/cloningnerf ... Nerfs Autocloning	2019-08-08 02:00:37 -07:00
kevinz000	ad7189a211	Merge pull request #9061 from deathride58/fuckfemurbreakers ... Makes the femur breaker use the proper scream emote and makes the femur breaker guarantee the victim falls into crit	2019-08-08 01:59:51 -07:00
kappa-sama	73e31aba04	Revert "Update teleporter.dm" ... This reverts commit 5fcb94d8d6.	2019-08-08 02:55:27 -04:00
kappa-sama	42c37d9de3	Revert "Update teleporter.dm" ... This reverts commit 2b3e53d7d6.	2019-08-08 02:55:24 -04:00
kappa-sama	85dc61f84d	Revert "Update teleporter.dm" ... This reverts commit c963f5e43e.	2019-08-08 02:55:14 -04:00
kappa-sama	c963f5e43e	Update teleporter.dm	2019-08-08 02:40:51 -04:00
kappa-sama	2b3e53d7d6	Update teleporter.dm	2019-08-08 02:23:59 -04:00
kappa-sama	5fcb94d8d6	Update teleporter.dm	2019-08-08 02:12:31 -04:00
kappa-sama	f38ac0dfbf	possibly makes teleporter hate all races equally ... let's go	2019-08-08 01:49:06 -04:00
YakumoChen	deeda9ebdb	Update cloning.dm	2019-08-07 07:53:14 +00:00
Ghommie	de8137d6c8	One line fix for invisible zipties.	2019-08-06 23:19:28 +02:00
Cebutris	3e6112fec0	adds the hug gloves to the arcade reward pool	2019-08-06 16:48:49 -04:00
deathride58	ddb29551fc	paren	2019-08-06 11:28:01 -04:00
deathride58	ee0d7a4ed3	Fixes issues with femur breaker by replacing the forced speech with a proper scream emote and making it guarantee landing in crit	2019-08-06 07:43:28 -04:00
Sishen	decbd37ced	Update closets.dm	2019-08-06 03:49:08 -04:00
kevinz000	aea2f6f523	Merge pull request #8900 from Seris02/spaceruinsyee ... Abductor Replication Lab space ruin - take 2	2019-08-05 00:55:40 -07:00
kevinz000	9ec56077b6	Merge pull request #8908 from Ghommie/Ghommie-cit142 ... Fixes Zelus flasks a bit.	2019-08-05 00:54:43 -07:00
kevinz000	b292bc7187	Merge pull request #9007 from Ghommie/Ghommie-cit168 ... Fixes and standarizes sword sheaths/scabbards overlays.	2019-08-05 00:49:49 -07:00
kevinz000	a105ba4bb6	Merge pull request #8774 from Sishen1542/monkeycult ... Removes the human check from cap/chap mind on cult conversion.	2019-08-05 00:47:04 -07:00
kevinz000	86a2d917e5	Merge pull request #8913 from Trilbyspaceclone/clockstoles ... Makes brass/bronze bar stools and stools - Same as normal ones	2019-08-05 00:45:56 -07:00
kevinz000	9852084200	Merge pull request #9019 from Ghommie/Ghommie-cit172 ... Adds in a stereotypical vegetarian MRE. Tweaks the rest.	2019-08-05 00:44:15 -07: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	c92e8b43bf	Merge pull request #9042 from EgoSumStultus/femur-breaker ... [ THE FEMUR BREAKER ]	2019-08-04 22:27:42 -07:00
EgoSumStultus	5bfe4492a1	huhhh... huhu....	2019-08-04 22:15:10 -07:00
kevinz000	8fa888f408	Merge pull request #8995 from Ghommie/Ghommie-cit165 ... Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss	2019-08-04 19:21:38 -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	5f87927b0a	Merge pull request #9030 from CameronWoof/iv-drip-fix ... Fixes a visual glitch with beakers containing water attached to IV stands	2019-08-04 19:18:00 -07:00
kevinz000	7a3d895997	Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes ... Tweaks cakes, adds in more of them as well as a few more tarts - All hidden	2019-08-04 19:15:18 -07:00
kevinz000	8452cf3b8a	Merge pull request #9014 from Ghommie/Ghommie-cit170 ... undergarment fixes.	2019-08-04 19:13:21 -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
EgoSumStultus	464a589c25	*sobbing noises*	2019-08-03 07:34:32 -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