Commit Graph

14046 Commits

Author SHA1 Message Date
Sishen
f59b60e83a QOL OOGA BOOGA 2019-08-08 01:11:20 -04:00
kevinz000
d1548c7907 Merge pull request #9058 from Ghommie/Ghommie-cit180
Defaults the teleportation forceMove arg to TRUE.
2019-08-05 15:39:39 -07:00
kevinz000
eab07c62de Merge pull request #9045 from CameronWoof/codifying-mrp-again
Officially ends the non-stop thrill ride of coating the station in your gender fluids for "fun"
2019-08-05 14:57:54 -07:00
Ghommie
8978f0ecf9 Defaults the teleportation forceMove arg to TRUE. 2019-08-05 18:19:48 +02:00
Cameron!
33d883367a makes fluid_rate match the intended rate 2019-08-05 06:41:57 -07: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
ed30f9ba58 Merge pull request #9046 from Sishen1542/satdeleite
meteor sats are no longer dense objects
2019-08-05 00:50:04 -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
4f0dc33d1b Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
2019-08-05 00:49:29 -07:00
kevinz000
f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167
Fixes inactive high luminosity eyes turning back on as soon as you move around.
2019-08-05 00:49:14 -07:00
kevinz000
cd6699cfed Merge pull request #8660 from Trilbyspaceclone/Unmodular
Ummodular a few files - Fixes Freelance Crate costs
2019-08-05 00:47:28 -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
Trilbyspaceclone
3bad062c23 Merge branch 'master' into Unmodular 2019-08-05 00:04:44 -04:00
kevinz000
2654a5388e Merge pull request #9024 from Ghommie/Ghommie-cit176
Ports "Lizardwine drink crafting fix"
2019-08-04 19:22:52 -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
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
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
afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations
Fixed WarOps Challenge incorrectly counting players
2019-08-04 19:14:08 -07:00
kevinz000
e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203
fixes a few snowcones being bad grammared
2019-08-04 19:13:44 -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
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
Sishen
51943d4c75 dduhhhhhhhd duurrrrrrrr 2019-08-04 04:56:55 -04: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
EgoSumStultus
464a589c25 *sobbing noises* 2019-08-03 07:34:32 -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
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
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