Commit Graph

54548 Commits

Author SHA1 Message Date
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571
[MIRROR] Colony Director -> Site Manager
2020-08-28 13:17:58 -04:00
Novacat
bac13fc41d Merge pull request #8858 from VOREStation/upstream-merge-7551
[MIRROR] Improves Portal Documentation for New Mappers unfamiliar with DIR
2020-08-28 13:04:56 -04:00
Novacat
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456
[MIRROR] The great Aurora shoe heist
2020-08-28 13:04:33 -04:00
Novacat
25058122bf Merge pull request #8826 from VOREStation/upstream-merge-7555
[MIRROR] Actually adds (and TESTS) exclude_mobs parameter to visible_message
2020-08-28 13:02:03 -04:00
Novacat
180e265744 Merge pull request #8855 from VOREStation/upstream-merge-7548
[MIRROR] Xenoarchaeology Upkeep
2020-08-28 13:01:47 -04:00
Novacat
b66cfb340c Merge pull request #8870 from VOREStation/upstream-merge-7574
[MIRROR] Adds Engine Randomization on Mapload! (From VOREStation!)
2020-08-28 12:56:12 -04:00
Novacat
533cba89ec Update skills.dm 2020-08-28 12:55:26 -04:00
Novacat
3004db5124 Update security.dm 2020-08-28 12:54:54 -04:00
Novacat
de8ef9709b Update vorestation.dme 2020-08-28 12:53:47 -04:00
Novacat
40396ef8d7 Update Dreaming.dm 2020-08-28 12:52:12 -04:00
Novacat
5c83c09e52 Update portal.dm 2020-08-28 12:50:18 -04:00
Unknown
abef279ba7 compatibility fixes 2020-08-28 12:49:11 -04:00
Novacat
33b1eb1cdb Update mob.dm 2020-08-28 12:38:16 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions
Massive Ambience and Sound Overhaul + Addition
2020-08-28 00:47:23 -04:00
Novacat
1de8723e2d Merge pull request #8874 from Rykka-Stormheart/shep-dev-fix-mirror
Fixes incoming PR, removes now-duplicated code
2020-08-28 00:22:07 -04:00
Novacat
46ae945283 Merge pull request #8871 from VOREStation/upstream-merge-7575
[MIRROR] Make it so beer bottles are filled. No longer get scammed!
2020-08-28 00:21:41 -04:00
Novacat
e6d564016a Merge pull request #8869 from VOREStation/upstream-merge-7572
[MIRROR] 8 SPICY POIS!
2020-08-28 00:20:51 -04:00
Novacat
490f1ccb40 Merge pull request #8867 from VOREStation/upstream-merge-7569
[MIRROR] Removes Unused Map Files to reduce filebloat and map confusion
2020-08-28 00:20:34 -04:00
Novacat
219dde8edb Merge pull request #8865 from VOREStation/upstream-merge-7567
[MIRROR] Fix a pizza issue.
2020-08-28 00:20:08 -04:00
Novacat
cca44bdb1f Merge pull request #8864 from VOREStation/upstream-merge-7568
[MIRROR] Add a warning line to the supply computer about access.
2020-08-28 00:19:43 -04:00
Novacat
4e2038b9c0 Merge pull request #8863 from VOREStation/upstream-merge-7565
[MIRROR] Fix ventcrawling while in 0 gravity
2020-08-28 00:19:02 -04:00
Novacat
b01633b67e Merge pull request #8860 from VOREStation/upstream-merge-7558
[MIRROR] Returns the jackolantern overlay
2020-08-28 00:18:18 -04:00
Novacat
e370fda424 Merge pull request #8859 from VOREStation/upstream-merge-7554
[MIRROR] Fixes turf slowdown not applying on non-water/snow turfs
2020-08-28 00:17:58 -04:00
Novacat
2dabf37c56 Merge pull request #8857 from VOREStation/upstream-merge-7553
[MIRROR] [Untested] Emotes won't be foiled by pesky capitals
2020-08-28 00:17:36 -04:00
Novacat
f412e7555f Merge pull request #8856 from VOREStation/upstream-merge-7550
[MIRROR] Fix combinination_cook() creating items with no reagents
2020-08-28 00:17:18 -04:00
Novacat
5841a011a9 Merge pull request #8854 from VOREStation/upstream-merge-7480
[MIRROR] Ports Aurora Diona markings
2020-08-28 00:16:56 -04:00
Novacat
7db483cb4b Merge pull request #8875 from VOREStation/upstream-merge-7584
[MIRROR] Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-28 00:13:30 -04:00
Rykka
53604a1524 Re-enables mapping.dm 2020-08-27 22:10:23 -04:00
VirgoBot
7b4c232286 Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs 2020-08-27 21:45:33 -04:00
Atermonera
4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
2020-08-27 21:45:33 -04:00
Rykka
6f3ca562ed Fixes incoming PR, removes now-duplicated code
Removes mapping_vr.dm, engine.dm, and engine_areas.dm, given that these are now enabled in the core engine.dm
2020-08-27 21:42:42 -04:00
VirgoBot
af3d81180c Make it so beer bottles are filled. No longer get scammed! 2020-08-27 21:31:30 -04:00
Atermonera
f426b13bde Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN
Make it so beer bottles are filled. No longer get scammed!
2020-08-27 21:31:30 -04:00
Atermonera
c69d4ab48a Adds Engine Randomization on Mapload! (From VOREStation!) 2020-08-27 21:28:09 -04:00
VirgoBot
d96644b3a6 8 SPICY POIS! 2020-08-27 20:44:20 -04:00
Atermonera
d03dde4555 Merge pull request #7572 from Kazzc/Wilderiness-POI's
8 SPICY POIS!
2020-08-27 20:44:20 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
a07c6ce49b Removes Unused Map Files to reduce filebloat and map confusion 2020-08-27 20:39:44 -04:00
VirgoBot
6452e67b56 Fix a pizza issue. 2020-08-27 20:38:16 -04:00
Atermonera
9e76d0ca68 Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX
Fix a pizza issue.
2020-08-27 20:38:16 -04:00
VirgoBot
ff47d73eeb Add a warning line to the supply computer about access. 2020-08-27 20:38:04 -04:00
Atermonera
0d128297d7 Merge pull request #7568 from lbnesquik/Kot-Cargo-comp-tweak
Add a warning line to the supply computer about access.
2020-08-27 20:38:04 -04:00
VirgoBot
a044187a96 Fix ventcrawling while in 0 gravity 2020-08-27 20:36:48 -04:00
Atermonera
109fc5259c Merge pull request #7565 from Cyantime/patch-1
Fix ventcrawling while in 0 gravity
2020-08-27 20:36:48 -04:00
VirgoBot
2e0ac924ca Returns the jackolantern overlay 2020-08-27 19:58:53 -04:00
Atermonera
f0bfa69416 Merge pull request #7558 from Cyantime/lanternlight
Returns the jackolantern overlay
2020-08-27 19:58:53 -04:00
VirgoBot
b371cc9ac5 Fixes turf slowdown not applying on non-water/snow turfs 2020-08-27 19:57:37 -04:00
Atermonera
de5d1f6120 Merge pull request #7554 from Heroman3003/turfslow
Fixes turf slowdown not applying on non-water/snow turfs
2020-08-27 19:57:37 -04:00
Atermonera
96116057c0 Improves Portal Documentation for New Mappers unfamiliar with DIR 2020-08-27 19:47:56 -04:00
VirgoBot
109c06b18c [Untested] Emotes won't be foiled by pesky capitals 2020-08-27 19:47:44 -04:00