Commit Graph

27178 Commits

Author SHA1 Message Date
Heroman
95ad68553f Fixes pizzaguy uniform 2021-05-25 19:50:24 +10:00
Novacat
6de7925d48 Merge pull request #10395 from TheFurryFeline/patch-32
Lore Fixy
2021-05-24 15:57:26 -04:00
Novacat
fb4cee4e88 Merge pull request #10399 from VOREStation/upstream-merge-8094
[MIRROR] phoron bore stock parts now affect range, along with other bits
2021-05-23 18:27:54 -04:00
Novacat
445effcaf5 Merge pull request #10398 from VOREStation/upstream-merge-8095
[MIRROR] Wall-mounted Geiger Counters
2021-05-23 18:27:41 -04:00
Atermonera
acd97ff613 Merge pull request #8094 from Hatterhat/pbore-buff
phoron bore stock parts now affect range, along with other bits
2021-05-23 15:40:29 -04:00
Atermonera
7cfd8f3435 Wall-mounted Geiger Counters 2021-05-23 15:40:14 -04:00
Atermonera
bf07cddb6d Merge pull request #8074 from Atermonera/unmap_tin
Removes tin for ore generation
2021-05-23 15:40:02 -04:00
TheFurryFeline
f4a05446e7 Requested Override 2021-05-23 14:50:52 -04:00
TheFurryFeline
229f8c37d1 Lore Fixy 2021-05-23 14:39:10 -04:00
izac112
e735443b8b adds missing instances of "result =" 2021-05-23 18:51:25 +02:00
Novacat
aa18ae953c Merge pull request #10381 from Verkister/patch-53
Fixes soulcatcher nifsoft spawning with faulty toggle
2021-05-22 20:26:56 -04:00
Aronai Sieyes
4e1308d48c Add mapping units/beacons for explo 2021-05-22 17:13:43 -04:00
Verkister
c358711458 Update 13_soulcatcher.dm
Fixes soulcatcher nifsoft spawning with incorrect toggle that causes the menu to show the opposite setting instead.
Also fixes soulcatcher catching prey by default.
2021-05-22 23:44:43 +03:00
Unknown
6a524b865b Compile Fix 2021-05-22 16:12:05 -04:00
Unknown
21d5da0f1b Manual port Polaris Fixes
Ports https://github.com/PolarisSS13/Polaris/pull/8099 and https://github.com/PolarisSS13/Polaris/pull/8101
2021-05-22 16:02:13 -04:00
Novacat
fb56cd4573 Merge pull request #10375 from VOREStation/Arokha/juke
Split jukebox into two files, commit one
2021-05-22 15:31:41 -04:00
Novacat
485eeff1a0 Merge pull request #10366 from lbnesquik/rereerretrtr
Changes Print vore belly settings to X-print vore belly settings.
2021-05-22 15:30:17 -04:00
Novacat
8f38aed965 Merge pull request #10362 from VOREStation/Arokha/holo2
Add portable mapping devices
2021-05-22 15:25:59 -04:00
Aronai Sieyes
69af91a968 Split jukebox into two files, commit one 2021-05-22 14:16:21 -04:00
ShadowLarkens
f178363d72 Fix spicy burrito having no icon 2021-05-21 20:07:25 -07:00
ShadowLarkens
df81aa0767 Fix sharkmeat having incorrect path 2021-05-21 20:07:10 -07:00
ShadowLarkens
5530912a3e Remove kabob with no actual definition 2021-05-21 20:06:53 -07:00
ShadowLarkens
2847ea4bbd Fix cookie having no icon (convert everything to cookiesnack) 2021-05-21 20:06:31 -07:00
ShadowLarkens
5e671acf04 Build all vending machine inventories on startup (cursed) 2021-05-21 20:05:25 -07:00
Novacat
efb22a5fb1 Merge pull request #10368 from VOREStation/upstream-merge-8083
[MIRROR] Food 4 thought
2021-05-21 15:59:35 -04:00
Atermonera
20cc021888 Merge pull request #8089 from TheFurryFeline/TFF-Possibly_Fix_Cleanbots
[Bugfix] Maybe Fix Cleanbots
2021-05-20 23:52:55 -04:00
klaasjared
c380e04b0a Food 4 thought 2021-05-20 23:13:37 -04:00
Aronai Sieyes
20e0fcd2d9 Merge pull request #10342 from Ketrai/fennetreatstwo
Adds some fennec treats
2021-05-20 15:54:05 -04:00
Aronai Sieyes
29a89cf555 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 15:04:37 -04:00
lbnesquik
4cad0dd086 Changes Print vore belly settings to X-print vore belly settings.
The reason for this change is that it this verb is really cool, but it also messes with speed typing 'Vore panel'
Given you use the 'Print' verb maybe once per two weeks, i added the X to make it show last.
2021-05-20 13:15:08 +02:00
Aronai Sieyes
2bb0c40d5b Reduce power usage 2021-05-19 10:29:30 -04:00
Aronai Sieyes
a1f8fd71b7 Make it small 2021-05-18 23:20:43 -04:00
Aronai Sieyes
21ff8be627 Portable mapping units 2021-05-18 22:56:03 -04:00
Aronai Sieyes
7237e834c3 VS: Fix random NIF bug 2021-05-18 22:55:03 -04:00
Aronai Sieyes
1090117006 Refactor holomap generation 2021-05-18 22:54:52 -04:00
Lunaball
fe3f63b423 Adding an approved custom item
Adds Antoinette's ritual supplies. One glass knife, one harness, one bottle of ground poppy reagents.
2021-05-18 13:13:47 -06:00
Novacat
d4024d297b Merge pull request #10339 from klaasjared/Baystation-Pilot-Helmet-Port
Ports the Baystation Pilot Helmets
2021-05-18 08:33:51 -04:00
Atermonera
1ffac51f26 Merge pull request #8052 from Atermonera/simplemob_pathing_improvements
Simplemobs seek lost targets
2021-05-18 02:49:34 -04:00
Novacat
a17321ae02 Merge branch 'master' into wintercoats 2021-05-17 18:28:41 -04:00
Ketrai
627200efed Final fix, lil typo. 2021-05-17 23:57:35 +02:00
Ketrai
85794f77c0 Merge branch 'master' into fennetreatstwo 2021-05-17 23:45:13 +02:00
Novacat
1b1ed3372c Merge pull request #10345 from Heroman3003/spdrfix
Fixes pixel offsets resetting on Giant Spider Queen
2021-05-17 15:53:31 -04:00
Heroman
f3209959cc Fixes pixel offsets resetting on Giant Spider Queen 2021-05-18 05:28:31 +10:00
Killian
74612eaedd loadout tweaks 2021-05-17 00:24:34 +01:00
Ketrai
24a40b4c60 Attempt fix
god
2021-05-16 23:40:05 +02:00
Novacat
f4e98e84d3 Update movement_vr.dm 2021-05-16 14:11:34 -04:00
Verkister
b5222d656b Update movement_vr.dm 2021-05-16 19:14:12 +03:00
Verkister
c508d25d59 Fixes ghosts breaking dropnoms
yeah
2021-05-16 15:25:34 +03:00
klaasjared
71e19c7a4e Adds the code and helmets
Adds the code and helmets
2021-05-15 23:55:03 -04:00
Aronai Sieyes
e42547db74 Various qdel helpers 2021-05-15 16:10:08 -04:00