Commit Graph

27387 Commits

Author SHA1 Message Date
Novacat
85569fff1b Merge pull request #10657 from TheDavestDave/phaser-handbow
adds the phaser handbow
2021-06-17 15:49:27 -04:00
Novacat
8d33fa238a Merge pull request #10660 from klaasjared/Talon_Merch
ITV Merchandise (Talon Gear)
2021-06-17 15:48:59 -04:00
Heroman
1e6682be3a Fixes promethean hair remaining transparent when it is disasbledparent despite 2021-06-18 05:02:59 +10:00
Aronai Sieyes
11e76bde92 Merge pull request #10476 from Very-Soft/Gatewaytime
More Gateway Stuff!
2021-06-17 00:52:45 -04:00
klaasjared
bc497ca372 Adds EVERYTHING
I never did any other commits so here is all the code stuffs
2021-06-16 02:09:29 -04:00
TheDavestDave
c9c0c77054 adds the phaser handbow
adds a resprited phaser holdout. Instead of a beam it does a bolt that does the exact same damage. it also has no non-taser replacement becuase it needed it's own spirte and I already modded it twice for lethal and low power.
2021-06-15 23:37:51 +01:00
Heroman
0ce0af6a4e Refluffs Pink Moo into Pink Russian 2021-06-15 16:39:28 +10:00
Novacat
4aea61dec4 Revert "[MIRROR] Fixes some unseen combat ai jank" 2021-06-14 13:36:59 -04:00
Novacat
87440b8a12 Merge pull request #10638 from VOREStation/upstream-merge-8116
[MIRROR] Fixes some unseen combat ai jank
2021-06-14 13:35:36 -04: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
7e89721063 Update ai_holder_combat_unseen.dm 2021-06-14 08:14:58 -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
Verkister
20535eb0b4 Fixes some unseen combat ai jank 2021-06-14 01:34:12 -04:00
Aronai Sieyes
74ee4843d2 Portable mapping devices 2021-06-14 01:32:59 -04:00
VerySoft
d461a75caa fix da parenthisis 2021-06-13 21:11:20 -04:00
VerySoft
fa6510f36c New Gateway Stuff!
Some new gateway things, it mostly works I just need to populate things and work out a couple kinks.
2021-06-13 21:04:29 -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