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
b594520a74
next set of spans ( #16434 )
...
* next set of spans
* some more
* next
* next
* next
* .
* text...
* next... rest soon
* .
* .
* ok last set for the night
* .
* .
* .
* .
* some more
* next
* next
* all for now
* .
* some more easy ones
* some more easy ones
* .
* .
* some more bolds
* oups auto complete moment
* add the remaining spans
* this as well
* this as well
* .
* .,
* resync them properly
2024-10-16 23:37:27 +02:00
409aaba802
Remove
2024-09-09 02:36:53 +02:00
186475ef6d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-06-03 22:08:11 +02:00
5c502c231e
lost borg changes ( #15994 )
2024-05-22 04:53:06 +10:00
2a815d66d2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-04-03 16:56:15 +02:00
5d9f0462c1
Merge pull request #12579 from GhostActual/tg-port-5
...
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
ef2ef019cb
Base Commit
2022-04-01 03:33:58 -04:00
d97ffa3c16
Base Commit
2022-04-01 02:04:21 -04:00
d1e595e7e7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-02-20 23:23:34 +01:00
7994cd6eb3
Bad fix WIP
2021-08-26 12:07:53 -04:00
06528b0674
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-08-16 21:05:37 +02:00
29b29bf8a6
Survival crafting stuff
...
Stuff! For surviving in the wilderness.
2021-08-09 17:48:10 -04:00
38ccfae3e0
Voreupdate
2021-07-19 09:12:02 +02:00
897cf4b57e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-17 10:36:29 +02:00
a843667af3
Fixes a bunch of bools missed in #11100
2021-07-16 15:55:49 -05:00
577b986ba6
Convert some bools to TRUE/FALSE instead of 1/0. ( #11100 )
...
Co-authored-by: Aronai Sieyes <arokha@arokha.com >
2021-07-16 13:43:25 -04:00
dd8893112f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-08 09:40:23 +02:00
b71c7e7271
Use material defines more
2021-07-03 18:18:05 -04:00
ffc6a2a369
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-18 17:01:47 +02:00
db14882664
Port tg lighting system
...
Also converts planet lighting to a new system
Too hard to separate out from this PR
2021-06-17 00:18:09 -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
c59c794ecc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-12-09 03:29:16 +01:00
7ed50074aa
polaris#7778 earlyport
2020-12-07 01:34:32 -06:00
79abbcbc2f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-06-03 18:30:13 +02:00
719151a74a
Port Bay's lockers, crates, largecrates, wall lockers
2020-05-31 12:26:00 -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
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
b240e8d60d
Fixes flags anchoring themselves wrong way
2019-04-08 10:34:21 +10:00
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
1519496d9f
Merge pull request #4849 from VOREStation/upstream-merge-5978
...
[MIRROR] Unpicks some mining spaghetti
2019-03-28 22:01:36 -04:00
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
69d4688e28
Unpicks some mining spaghetti ( #5978 )
...
* Untangle xenoarch from mining somewhat
* professionalism
* sonic jackhammers only for artefact-safe tunnelling
* destroy artefacts code disabled on everything
2019-03-12 20:01:15 -04:00
10ca5bb70f
Merge remote-tracking branch 'upstream/master'
2018-10-14 17:09:41 +01:00
f0db332943
Remplace sprite hammer with pickaxe
2018-10-09 16:28:45 -04:00
9bb51e45e4
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/machinery/vending.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/eating/bellymodes_vr.dm
# config/custom_items.txt
# icons/obj/mining.dmi
2018-02-24 22:51:59 -05:00
7cc8fa0cba
Gives Miners shinybits. ( #4840 )
...
* Gives miners marker beacons, moves their locker to another file
* Makes marker beacons ITEM_SIZE_SMALL
2018-02-17 11:19:48 -08:00
22d13f10c2
All my changes so far.
...
note to self: Engineering, Perma, civil jobs, and electricity+piping
2018-02-02 04:57:01 -05:00
5b54f4c875
Surface Map Work ( #4557 )
...
* Tweaks Surface, POI system
* More Stuff
* Travis Appeasement
* Fixes invisible banner.
2018-01-17 13:46:19 -06:00
36e4adaf8f
Modifies Illegal Equipment Module
...
+Illegal equipment module now scrambled equipment module
+Scrambled equipment module now unlocks emagged borg items without
actually emagging the borg, allowing for AI sync, law updates, and being
emagged.
+Makes the miner borg diamond drill appear in all cases of being
upgraded or emagged instead of only if emagged while the mining module
is equipped.
Changelog includes all my previous PRs as well for ease of access to the
changes by the general public. I can trim it down to just this PR if
requested.
2017-07-29 17:32:33 -05:00
7f773b0099
Adds Winter boots for every department! Adds said boots to the loadout. Adds boots to all the closets and wardroves that had winter jackets. Adds boots and jackets to some closets that had neither and fitted in.
2017-06-05 16:46:54 -03:00
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
93d07036ef
Rewrites xenoarch
...
See changelog
2016-08-07 08:26:26 +03:00
7b1eb6c099
Refactors specialized satchels as children of the regular (leather) satchel
2016-04-29 18:44:28 -05:00
f2cc74d588
# This is a combination of 2 commits.
...
# The first commit's message is:
Rewriting the mining turfs to reduce worldstart lag.
# This is the 2nd commit message:
Map cleanup.
2015-12-16 15:26:38 +10:30
izac112