Commit Graph

27375 Commits

Author SHA1 Message Date
Heroman
0ce0af6a4e Refluffs Pink Moo into Pink Russian 2021-06-15 16:39:28 +10:00
Novacat
c6141c3bde Update mapper.dm 2021-06-14 13:35:16 -04:00
Novacat
77fe685cdf Merge branch 'master' into upstream-merge-8097 2021-06-14 08:19:07 -04:00
Novacat
33efe81f18 Update mapper.dm 2021-06-14 08:17:26 -04:00
Novacat
13e03b3c41 Merge pull request #10643 from VOREStation/upstream-merge-8126
[MIRROR] Added unit test to ensure emote key uniqueness.
2021-06-14 08:14:03 -04:00
Novacat
bc9ba53c1f Update audible.dm 2021-06-14 07:55:04 -04:00
Atermonera
e0f2aae531 Merge pull request #8135 from Ketrai/letthemeatcakeagain
Makes the chaos cake cheaper.
2021-06-14 03:35:28 -04:00
Atermonera
fec4ba87e2 Added unit test to ensure emote key uniqueness. 2021-06-14 03:30:01 -04:00
Aronai Sieyes
74ee4843d2 Portable mapping devices 2021-06-14 01:32:59 -04:00
ShadowLarkens
1e9a6e024c Update doc 2021-06-12 20:07:41 -07:00
ShadowLarkens
a3674a664d Autolathe: Implement Material Container Component
First implementation, allows insertion but printing doesn't work yet.
2021-06-12 18:17:46 -07:00
ShadowLarkens
2a70cfe91f MaterialContainer: Add a component to hold materials
No implementations in this commit.
2021-06-12 18:17:44 -07:00
Aronai Sieyes
07f0292fdd Fix will_eat returning true if !devourable 2021-06-12 01:33:34 -04:00
Aronai Sieyes
dd3624085a Merge pull request #10609 from ShadowLarkens/fix_circuits
Fix Integrated Circuits being completely broken
2021-06-11 21:03:21 -04:00
Aronai Sieyes
537deaf72f Merge pull request #10603 from Heroman3003/absorbexamine
Adds Absorbed Examine settings to Vore Panel
2021-06-11 21:02:44 -04:00
Aronai Sieyes
4cfc45a934 Merge pull request #10617 from Heroman3003/EARENING
Adds PROPER tajaran ears as char setup option in ear category
2021-06-11 21:02:00 -04:00
Aronai Sieyes
0873291e8a Merge pull request #10619 from Heroman3003/unegg
Fixes eggless spider versions still laying eggs if 'nest' was someone's body
2021-06-11 21:00:58 -04:00
Aronai Sieyes
646ea4a1b5 Merge pull request #10614 from VOREStation/Arokha/tbremove
File tweaks
2021-06-11 21:00:02 -04:00
Aronai Sieyes
7f40d50987 Respect steppy prefs, add var to disable autodoom 2021-06-11 20:44:19 -04:00
Aronai Sieyes
ea747e9c5a Adds a very lorg fen 2021-06-11 20:36:28 -04:00
Heroman
531b52f5f4 Fixes eggless spider versions still laying eggs if 'nest' was someone's body 2021-06-12 06:31:32 +10:00
Heroman
5c31cb91af Softly deprecates old ears 2021-06-12 05:47:09 +10:00
Heroman
e7975ff47b Adds PROPER tajaran ears as char setup option in ear category 2021-06-12 05:33:31 +10:00
Aronai Sieyes
db0e540c42 Remove tether_better
It's in the history!
2021-06-11 15:29:19 -04:00
Aronai Sieyes
2c91058cbd VS: Map changes and protean fix 2021-06-11 14:12:49 -04:00
ShadowLarkens
e9cc908b92 Fix Integrated Circuits being completely broken
The Dreamchecker changes accidentally shadowed some variables
2021-06-10 12:56:11 -07:00
Heroman
420dcea6dc Fixes some logics 2021-06-10 17:00:29 +10:00
Aronai Sieyes
643caba532 Merge pull request #10604 from Heroman3003/succ-the-hemoglobin
Adds a different version of bloodsucker trait
2021-06-09 22:26:15 -04:00
Aronai Sieyes
751c7c09fb Merge pull request #10591 from Hatterhat/fortnite
i haven't slept but here's a fix pr for 10588
2021-06-09 22:19:00 -04:00
Aronai Sieyes
56ee370560 Merge pull request #10601 from VOREStation/Arokha/panicbutton
Add distress beacons to overmap ships/visitables
2021-06-09 22:18:16 -04:00
Aronai Sieyes
9a948ca38a Small tweaks and more sound 2021-06-09 17:37:41 -04:00
Heroman
37de970205 Adds a different version of bloodsucker trait 2021-06-10 07:31:01 +10:00
Aronai Sieyes
c18529e034 Remove fake intent var 2021-06-09 16:59:50 -04:00
Aronai Sieyes
10a08e84fc Add distress beacon 2021-06-09 16:59:50 -04:00
Heroman
d89739c956 Adds Absorbed Examine settings to Vore Panel 2021-06-10 06:46:42 +10:00
Novacat
af53a2b523 Merge pull request #10598 from klaasjared/explo-duffle-fix
Exploration Duffle Fix
2021-06-09 10:42:06 -04:00
klaasjared
313c3a7a2a Adds in fix and comments
Fixes loadout to include new explo duffle and adds organizational comments to `backpack_vr.dm` to make it look nice.
2021-06-09 06:36:57 -04:00
Hatterhat
9c3dde9570 this is why we don't code without sleep, kids 2021-06-08 13:33:50 -05:00
Hatterhat
30b19abee7 i haven't slept 2021-06-08 13:28:54 -05:00
Verkister
0e45fe90e4 failsnek begone 2021-06-08 17:01:49 +03:00
Verkister
bf7c81f85d Makes voremobs with fullness-specific eye overlays utilize them.
Fixes voremobs with belly state specific eye/glow overlays not updating the overlays to match the fullness sprites
2021-06-08 16:51:09 +03:00
Novacat
156b60dced Merge pull request #10582 from klaasjared/phoron_dragon
Phoron Dragon Catalogue Data
2021-06-07 09:37:05 -04:00
Aronai Sieyes
e522009b7e Merge pull request #10564 from VOREStation/upstream-merge-8080
[MIRROR] Adds admin verb to hopefully fix database connection failures
2021-06-07 01:12:14 -04:00
klaasjared
66c82af42a Dragon Info 2021-06-07 01:06:45 -04:00
Aronai Sieyes
28712d57c6 Merge pull request #10572 from VOREStation/upstream-merge-8118
[MIRROR] Fixes infinite loop following cooking error
2021-06-07 00:50:10 -04:00
Z'uldiss
bb1c1b0a5e added spider emotes to list
Looks like I forgot to propose this part of the change. The emotes must be in, and the sounds, but we still can't use them without this, can we?
2021-06-06 12:05:52 -04:00
MarinaGryphon
b521587e82 Fixes infinite loop following cooking error (#8118)
* Fixes infinite loop following cooking error

```
		while (select_recipe(available_recipes,C) == recipe)
			var/list/TR = list()
			TR += recipe.make_food(C)
```
This would never consume reagents due to an early return, meaning it would never terminate from the while loop. Clearing the reagents is an easy fix for something that will hopefully never happen, and avoids locking the server up if it does.
Also makes such failures obvious.
TODO: Unit test for recipes without results.

* Fixes/tweaks

* fix CI
2021-06-06 05:37:45 -04:00
Atermonera
2b52489e1d Merge pull request #8080 from Atermonera/dbcon_onebuttonfix
Adds admin verb to hopefully fix database connection failures
2021-06-06 03:44:29 -04:00
Aronai Sieyes
9fbe2cdfdd Merge pull request #10555 from VOREStation/Arokha/portajuke
Portable music player, remote jukebox speaker
2021-06-06 01:25:03 -04:00
Aronai Sieyes
be7725aae5 Merge pull request #10559 from VOREStation/Arokha/innerfix
Fix fake space edge turfs
2021-06-06 01:24:04 -04:00