1128c0cd18
[MIRROR] Mime care package ( #12773 )
...
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2026-05-21 11:30:47 -04:00
2c2c7b3e75
[MIRROR] Adds a box of legcuffs for mappers ( #12754 )
...
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2026-05-13 20:27:55 -04:00
Kashargul and GitHub
d75f90466d
removes all var/ in procs ( #12738 )
2026-05-05 10:55:04 +02:00
506f34c3f2
[MIRROR] Flammable Items, Abstractness, and hypnosis ( #12672 )
...
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2026-04-13 01:47:28 -04:00
3cac28f9ad
[MIRROR] Begin clickcode attack_self fix ( #12173 )
...
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2025-12-29 15:51:44 -05:00
3bc63ff7bf
[MIRROR] Large Bulb Replacements ( #11965 )
...
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com >
2025-11-11 21:38:09 +01:00
71ce1e1323
[MIRROR] Power Outage Buffs ( #11627 )
...
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com >
2025-09-11 22:09:06 -04:00
a59d0bf195
[MIRROR] upport petcubes ( #11363 )
...
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com >
Co-authored-by: C.L. <killer65311@gmail.com >
2025-08-09 12:09:10 -04:00
05b57277bf
[MIRROR] Faltered & Dormant diseases update ( #10985 )
...
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
2025-06-01 03:01:58 +02:00
7bfffc808d
[MIRROR] Adds Trait Genetics ( #10142 )
...
Co-authored-by: Cameron Lennox <killer65311@gmail.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-02-13 15:41:59 +01:00
499e8e7ee9
[MIRROR] removes center of mass list ( #10081 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-02-07 15:08:58 +01:00
7416cbea22
[MIRROR] next set of spans ( #9247 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-10-18 01:33:07 +02:00
ab154b48b2
[MIRROR] refactors most spans ( #9139 )
...
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-10-04 15:00:17 +02:00
31407a0be3
[MIRROR] First part of a span rework ( #9120 )
...
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-10-02 16:25:48 +02:00
5ea698a0ef
[MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] ( #9084 )
...
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Kashargul <KashL@t-online.de >
2024-09-30 21:36:41 +02:00
Cadyn and GitHub
cf1db3c049
Memory tracking shenanigans ( #8359 )
2024-05-15 16:56:31 +02:00
Drathek and GitHub
aa7cd0f69f
Tooling updates and removal of corrupt maps [MDB IGNORE] ( #7620 )
2024-02-05 18:49:02 -05:00
+5
aab270c74f
[MIRROR] remove static chat colour tags ( #7635 )
...
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com >
Co-authored-by: Raeschen <rycoop29@gmail.com >
Co-authored-by: Changelogs <action@github.com >
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com >
Co-authored-by: Eli <fracshun@gmail.com >
Co-authored-by: tacoguy7765093 <karokaromaro@gmail.com >
Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com >
Co-authored-by: TheGreatKitsune <88862343+TheGreatKitsune@users.noreply.github.com >
Co-authored-by: Missile597 <150307788+Missile597@users.noreply.github.com >
2024-01-29 18:45:19 -05:00
Aroliacue and GitHub
213a952c4a
Exploration Equipment Vendors and misc changes ( #7616 )
2024-01-28 18:25:39 -05:00
Casey and CHOMPStation2
61ea8e3f3d
New Donk-pockets
2022-04-06 02:12:51 +00:00
Casey and Darlantan
061b177978
Mini Aurora Port
2022-04-04 18:07:58 -04:00
Razgriz
c09ad1baa9
powder that makes you say yes and hate the map changes
2022-03-04 15:23:33 -07:00
Casey and CHOMPStation2
80f5298a18
Ammo Boxes
2022-03-03 21:23:43 +00:00
Casey and CHOMPStation2
3d6510f3ea
Donk Co. Toys
2022-02-19 04:27:50 +00:00
Casey and Chompstation Bot
ae13ff1ed2
Merge pull request #11524 from GhostActual/boxed
...
Boxing Day
2021-09-24 03:21:13 +00:00
Chompstation Bot
481c0e314e
Convert some bools to TRUE/FALSE instead of 1/0.
2021-07-16 17:44:40 +00:00
Aronai Sieyes and Chompstation Bot
30a01c6490
Merge pull request #10792 from VOREStation/Arokha/portamed
...
Eris portable freezer, medical briefcase
2021-07-03 20:26:49 +00:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Cerebulon and VirgoBot
7c57c7c0bd
Vendor enhancement fixes ( #7577 )
...
* Vendor enhancement fixes
* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
izac112
48af4c881c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-22 20:07:45 +02:00
Atermonera and VirgoBot
1e9e8c2c60
Flavour Enhancement: Vending
2020-08-20 21:25:31 -04:00
izac112
81871a960e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-08-10 21:50:42 +02:00
Mechoid and VirgoBot
c20bab52d4
Exosuit Modular Internals, The Squeakening
2020-08-05 19:22:23 -04:00
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
Mechoid and VirgoBot
7066d04df5
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
Repede
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
Aronai Sieyes
a7aa71e7ad
Fix matches and SSobj/SSprocessing
2020-03-29 16:19:13 -04:00
Atermonera and VirgoBot
8d2b41ad2c
Big Bastard Incidental Sound Port
2020-03-15 14:39:19 -04:00
Repede
c45d7c2196
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/modules/events/event_container_vr.dm
# icons/misc/title_vr.dmi
# interface/skin.dmf
# vorestation.dme
2020-03-01 12:35:52 -05:00
Repede
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
Atermonera and VirgoBot
11eed81b92
Ports precision placement of items
2020-02-22 02:35:41 -05:00
Arokha Sieyes and Leshana
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Atermonera and VirgoBot
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Cerebulon and VirgoBot
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
Repede
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
