87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
ec18de7d79
Replace all air_master nonsense with SSair
2024-10-23 05:47:09 -07:00
409aaba802
Remove
2024-09-09 02:36:53 +02:00
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
19e46d19b2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-17 01:06:24 +01:00
d99321bfdf
Cleaning up defines
2024-02-10 16:44:44 +01:00
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
0680645556
Weakref refactor
2023-06-01 20:31:54 +02:00
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
c2b084ebfa
Resolves sdmm warnings
2023-03-08 19:06:01 +01:00
1aa4c73e8d
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
2022-08-27 08:49:56 -04:00
d717a4b50a
Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298
2022-08-25 14:26:20 +10:00
71d069887c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-08 15:49:48 +02:00
1d5f2b5b37
Wires Colors & Exemptions
2022-07-04 00:06:02 +02:00
2a07a98cd1
/area/groundbase/civilian/bar/upper in exemption
...
Its only really that one open part
2022-07-02 21:16:35 +02:00
9dbb6fdd66
Testing Wires, Coordinates & Fixed Science Wall Area
2022-07-02 21:02:13 +02:00
b820e18abc
Updated title
2022-07-02 16:53:16 +02:00
3f9af78f3a
/atom New() => Initialize() [MDB IGNORE]
2021-11-14 03:09:51 -05:00
99243b1ce0
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-11-02 11:47:33 +01:00
81824e692f
Miscellaneous updates
...
makes it so some areas aren't required to be mapped in for unit tests
Area!
Attempt to fix active edge
Add/update planet art
Telecomms airlock fixed
Fixes the starstuff
now it brings both areas with it
Admin fluff
Some stuff for helping events happen, also makes the bluespace and redspace shimmers have a skybox icon
2021-10-27 19:55:53 -04:00
b546ac3605
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-08-09 10:39:11 +02:00
d6c8450ef1
Update vore space prot test
2021-08-02 12:49:40 -04:00
7551c94d95
Create a new empty zlevel for testing suffocation
2021-08-02 12:17:24 -04:00
4e14241cb8
Voreupdate
2021-07-21 15:16:48 +02:00
669d23322c
Change various things to subtypesof()
2021-07-20 12:54:59 -04:00
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
1fea1ac36d
voreupdate
2021-07-15 09:56:19 +02:00
d0d8e42edc
unify crash_with and stack_trace
2021-07-13 15:46:52 -05:00
76a8ac47fe
Voreupdate
2021-07-09 18:31:19 +02:00
7820442652
Fix log examine being weird.
2021-07-09 08:35:11 -05:00
ffc6a2a369
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-18 17:01:47 +02:00
a42526dc85
Fix ZAS insane pathing, add logging
2021-06-17 10:58:26 -04:00
fec4ba87e2
Added unit test to ensure emote key uniqueness.
2021-06-14 03:30:01 -04:00
5358989084
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-07 16:49:38 +02:00
f13665269d
Adds unit test for invalid recipes ( #8119 )
...
* Adds invalid recipe unit test
Checks for:
- Missing result type
- Result type is not /atom/movable (mob or obj)
- Result quantity unset
- Quantity less than or equal to zero
- Quantity is not an integer
* Update recipe_tests.dm
* adds tests to dme
* dont code at night (remix)
* Update recipe_tests.dm
2021-06-06 05:37:34 -04:00
bc8a71afd0
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-03-29 20:04:30 +02:00
45ad945a12
Ported updated decls repository from Neb.
2021-03-25 22:27:54 -04:00
054b1f0f8a
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2021-03-01 17:25:41 +01:00
3e804dc799
Sideports a couple of init unit tests from Neb.
2021-02-27 13:05:16 -05:00
03f0165bd3
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-29 05:56:00 +02:00
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
81871a960e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-10 21:50:42 +02:00
bc1db6310e
Adds Modifier Armor ( #7416 )
2020-08-07 00:25:15 -04:00
133a5f61d1
Ty Kel, Fixes ## UNIT_TEST: !! FAILURE !! [ZAS: Supply Shuttle]
...
## UNIT_TEST: !! FAILURE !! [ZAS: Supply Shuttle]
2020-05-07 00:22:53 +02:00
e44e346352
Release Update
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
2020-04-16 21:07:33 -04:00
262faa38e4
Replace global all_areas list with world.
...
It ends up having similar performance, so might as well not bother with all_areas.
2020-04-12 18:04:54 -04:00
c6b49dace2
zas test fix
2020-04-05 03:02:23 -04:00
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
izac112