CHOMPStation2StaffMirrorBot
5a62077f2c
[MIRROR] JSON Logging Refactor ( #11623 )
...
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-09-14 20:05:26 +02:00
CHOMPStation2StaffMirrorBot
89704592dd
[MIRROR] jobs, access and radio to defines ( #11546 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-08-31 03:56:12 +02:00
CHOMPStation2StaffMirrorBot
6169daa735
[MIRROR] ss atoms update ( #10736 )
...
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2025-04-25 08:18:14 +02:00
CHOMPStation2
462db08fff
[MIRROR] Stardog ( #6718 )
...
Co-authored-by: Casey <a.roaming.shadow@gmail.com >
Co-authored-by: Raeschen <rycoop29@gmail.com >
2023-08-06 00:24:31 +02:00
Casey
b4128afaf4
Merge pull request #15105 from Very-Soft/redgate
...
Don't spam the beginning of the round
2023-07-03 00:49:54 +00:00
Casey
4cefffe8f4
Merge pull request #15098 from Very-Soft/redgate
...
Randomness updates
2023-07-01 22:31:02 +00:00
Repede
5bc7f0bd72
'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
...
Also readds vore monkeys
2020-07-26 12:48:22 -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
1585388b19
Make away missions not worry about spawning as much
2020-03-14 13:51:00 -04: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
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Kelshark
aea1eee615
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# config/custom_items.txt
2018-02-21 22:19:24 -05:00
Leshana
38f20304ca
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
Kelshark
c0086f66ec
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# maps/RandomZLevels/backup/labyrinth.dmm
# vorestation.dme
2016-09-10 00:54:59 -04:00
Spades
4db23be7e3
Reactivates Away Gate ( #528 )
...
* Added stomach.ogg and stomach tiles for later
* Updated some gateway maps, added new (unfinished) one
* Snowfield progress
* This map is pretty much done!
* Return of the Gateway Maps
* Optimization of various shit.
* Copies a small fix from Polaris
https://github.com/PolarisSS13/Polaris/pull/2414
* Changed vore mob knockdown chance. Map fixes.
* Datraen corrects outstanding issues with away missions, separates certain parts of code into their own procs. (#532 )
* Final commit.
- Tried to fix vore mobs not attacking prey once they are disabled.
- Various map fixes to be consistent with fixed gateway setup.
- Gave Markov bad grammar.
- Fixed polar bears not dying.
- Modernized all gateway maps except the clown temple which is still
broken.
2016-09-06 13:36:04 -04:00
