Commit Graph

43958 Commits

Author SHA1 Message Date
Aronai Sieyes
bc6564deb6 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 19:05:42 +00:00
Nadyr
4764d593cb Merge pull request #1975 from CHOMPStationBot/upstream-merge-10339
[MIRROR] Ports the Baystation Pilot Helmets
2021-05-19 10:06:27 -04:00
Nadyr
610ca32831 Merge branch 'master' into upstream-merge-10327 2021-05-19 09:51:53 -04:00
Nadyr
1490827bbc Merge pull request #1966 from CHOMPStationBot/upstream-merge-10343
[MIRROR] Minor Loadout Tweaks
2021-05-19 09:47:40 -04:00
Nadyr
8b5a174060 Merge pull request #1960 from CHOMPStationBot/upstream-merge-10325
[MIRROR] Add persistent smartfridges with lossiness
2021-05-19 09:44:20 -04:00
Razgriz
62694cd3d5 Merge pull request #1969 from Cyrelius/Cyrelius-Medihound-fix
Fix Medihounds having only 2 uses of Trauma kits, burn kits, etc.
2021-05-19 06:24:37 -07:00
Razgriz
a3a053f2ae Merge branch 'master' into upstream-merge-10325 2021-05-19 06:22:33 -07:00
Nadyr
e0409904e4 powder that makes you say yes 2021-05-19 08:19:02 -04:00
Nadyr
eba6a3fa36 powder that makes you say yes 2021-05-19 08:12:30 -04:00
Nadyr
6a64221963 powder that makes you say yes 2021-05-19 08:10:17 -04:00
Nadyr
6b9dc2a135 powder that makes you say yes 2021-05-19 08:08:57 -04:00
Nadyr
c445a1ad4e powder that makes you say yes 2021-05-19 08:08:40 -04:00
Chompstation Bot
9784331cdb Add persistent smartfridges with lossiness 2021-05-19 08:08:40 -04:00
tyger
817d163c1c there, i guess 2021-05-19 10:49:59 +02:00
Razgriz
faad3af89e Merge pull request #1973 from CHOMPStationBot/upstream-merge-10351
[MIRROR] [MIRROR] More Spawner Tweaks
2021-05-18 23:20:00 -07:00
Razgriz
2852136ce7 Merge pull request #1972 from CHOMPStationBot/upstream-merge-10348
[MIRROR] [MIRROR] Simplemobs seek lost targets
2021-05-18 23:19:43 -07:00
Razgriz
08af30787a Merge pull request #1971 from CHOMPStationBot/upstream-merge-10347
[MIRROR] Arcade oversight fix
2021-05-18 23:17:41 -07:00
Razgriz
2e9c95fe1d Update loadout_suit_vr.dm 2021-05-18 21:07:22 -07:00
Razgriz
a6db643f79 Merge pull request #1967 from CHOMPStationBot/upstream-merge-10345
[MIRROR] Fixes pixel offsets resetting on Giant Spider Queen
2021-05-18 21:05:23 -07:00
Razgriz
cda655fffd Update loadout_accessories_vr.dm 2021-05-18 21:05:00 -07:00
Razgriz
1e205964a4 Merge pull request #1965 from CHOMPStationBot/upstream-merge-10344
[MIRROR] Explorer/Pilot ID & Locker Addons
2021-05-18 21:03:46 -07:00
Razgriz
32fc16628d Merge pull request #1964 from CHOMPStationBot/upstream-merge-10340
[MIRROR] Fixes ghosts breaking dropnoms
2021-05-18 21:03:00 -07:00
Razgriz
2e23da65f2 Merge pull request #1954 from CHOMPStationBot/upstream-merge-10315
[MIRROR] [MIRROR] Adds persistent smartfridges for garden products, material sheets
2021-05-18 21:02:06 -07:00
Chompstation Bot
c4aaf54601 Ports the Baystation Pilot Helmets 2021-05-18 12:34:21 +00:00
Novacat
b98bab980f Merge pull request #10351 from VOREStation/upstream-merge-8082
[MIRROR] More Spawner Tweaks
2021-05-18 12:32:05 +00:00
Novacat
33f92d51ac Merge pull request #10348 from VOREStation/upstream-merge-8052
[MIRROR] Simplemobs seek lost targets
2021-05-18 12:30:56 +00:00
Novacat
2250588b7a Merge pull request #10347 from dwinters99/arcade
Arcade oversight fix
2021-05-18 01:33:51 +00:00
Cyrelius
eacaceeb5b Fix Medihounds having only 2 uses of Trauma kits, burn kits, and clotting kits.
This change fixes another one in  954412a26a  that reduced Medihound's medical supplies seemingly unintentionally.
2021-05-17 16:37:55 -07:00
Chompstation Bot
dc4adb84dc Adds more winter coats + moves existing winter coats to the same file 2021-05-17 23:22:24 +00:00
Novacat
b28bf70a2f Merge pull request #10345 from Heroman3003/spdrfix
Fixes pixel offsets resetting on Giant Spider Queen
2021-05-17 19:53:41 +00:00
Chompstation Bot
3c3f14185d Minor Loadout Tweaks 2021-05-17 16:56:27 +00:00
Novacat
23d3beed44 Merge pull request #10344 from KillianKirilenko/kk-misc2
Explorer/Pilot ID & Locker Addons
2021-05-17 16:55:19 +00:00
Novacat
85a20c82c9 Merge pull request #10340 from Verkister/patch-51
Fixes ghosts breaking dropnoms
2021-05-16 18:36:37 +00:00
Razgriz
b953b2db37 Merge pull request #1957 from CHOMPStationBot/upstream-merge-10330
[MIRROR] AR Visor
2021-05-15 22:50:07 -07:00
Razgriz
8f2a2ee219 Merge pull request #1959 from CHOMPStationBot/upstream-merge-10332
[MIRROR] Touch up emote port
2021-05-15 22:49:07 -07:00
Razgriz
3e9d81b887 Merge pull request #1956 from CHOMPStationBot/upstream-merge-10328
[MIRROR] Pilot Headset Fix
2021-05-15 22:47:55 -07:00
Aronai Sieyes
2d4853ca4f Merge pull request #10310 from Novacat/nova-pathfinder
Mecha Balance and Fighter Fixes
2021-05-15 17:17:36 +00:00
Novacat
d5a6cb16a3 Merge pull request #10332 from VOREStation/Arokha/emoflip
Touch up emote port
2021-05-15 15:13:23 +00:00
Novacat
84661bfe35 Merge pull request #10330 from TheFurryFeline/TFF-AR_Visor_Port
AR Visor
2021-05-15 13:23:31 +00:00
Novacat
111cd2a1ad Merge pull request #10328 from klaasjared/pilot_fix
Pilot Headset Fix
2021-05-15 11:56:58 +00:00
Nadyr
bddfb995a2 Merge pull request #1912 from CHOMPStationBot/upstream-merge-10222
[MIRROR] Catalogue Entries V1
2021-05-14 01:15:36 -04:00
Nadyr
5f1528b34d Merge pull request #1950 from CHOMPStationBot/upstream-merge-10309
[MIRROR] Fixes Scream sounds
2021-05-14 01:05:55 -04:00
Nadyr
692c8df8e1 Merge pull request #1842 from CHOMPStation2/Razgriz1032-patch-6
Catalogue update
2021-05-14 01:05:29 -04:00
Nadyr
5fe4f38477 grammar 2021-05-14 01:04:42 -04:00
Nadyr
5dcb7f09fb grammar 2021-05-14 01:03:06 -04:00
Nadyr
c2d4da4ac2 grammar 2021-05-14 01:00:16 -04:00
Nadyr
ecd8f1e73a grammar 2021-05-14 00:59:12 -04:00
Nadyr
3b84b864f2 powder that makes you say yes 2021-05-14 00:57:58 -04:00
Nadyr
ea6f0fa259 powder that makes you say yes 2021-05-14 00:54:36 -04:00
Nadyr
88bac3f6e1 chompedits 2021-05-14 00:52:13 -04:00