Casey
928a321b5f
TGUI Input Conversions
2022-06-19 03:59:14 +00:00
Chompstation Bot
15cafbe65b
Optimize a couple things
2021-07-20 21:30:20 +00:00
Chompstation Bot
b6e1989a01
The One Where I Port Modals
2021-06-30 19:29:34 +00:00
Cadyn
d821df822a
Voting changes
2020-10-28 01:01:14 -07:00
TheFurryFeline
f2c21fc52b
Vote Sound Change Revert
...
Title. Back to the good old non-heart attack inducing sound.
2020-05-10 15:43:35 -04:00
Razgriz
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07:00
Shadow-Quill
2f2f9ef5bb
edit comment
2020-04-17 18:49:50 -05:00
Shadow-Quill
9be061fc31
As per request.
...
Co-Authored-By: Izac Joof Forsgren <izac10@live.com >
2020-04-17 18:49:00 -05:00
Shadow-Quill
5307de17df
Merge branch 'master' into MatterVote
2020-04-17 06:22:28 -05:00
Shadow Quill
eb157c5bf4
Matteralarm vote~
2020-04-17 03:53:37 -05:00
Repede
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
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
Leshana
6dc9ecd1af
Fix: Only call autogamemode vote once.
2020-04-10 11:41:38 -04:00
Atermonera
c467445cba
Adds confirmations message to cancel vote ( #6945 )
2020-04-04 22:29:43 -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
Atermonera
cb8548f5af
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -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
Razgriz
8635c10cb7
One hour
...
One hour instead of 4
2019-12-28 22:39:33 -07:00
izac112
6d1258bc11
Edit
2019-11-19 22:58:59 +01:00
izac112
f43601eecd
Changes it from "an additional hour" to "an additional four hours"
2019-11-19 22:55:33 +01:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
DigitalSquirrel95
30f751b23f
Update vote.dm
2019-10-11 02:29:58 -04:00
DigitalSquirrel95
bec4591556
Changes the crew transfer message to be more IC friendly.
...
A simple change that changes the crew transfer vote message to something that implies the crew is voting for extra work on their PDAs. This makes the crew transfer make a bit more sense in character, because as it stands, our characters are currently coming to work not really knowing when they get off work.
Direct port of this: https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/572
2019-10-11 01:43:00 -04:00
Hawk_v3
5f92049ed7
Yeah no, we like our long rounds.
...
Minimal changes to code.
2019-04-22 21:05:56 +01:00
Novacat
557a36e2e5
Conflict Resolution
2019-04-18 13:47:28 -04:00
Atermonera
7f97c8e7cc
Makes transfer always occur if nobody is playing.
2019-04-18 13:45:57 -04:00
Unknown
0e6c82ed60
Conflict Resolution
2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Anewbe
549adf6baf
Merge pull request #5719 from lbnesquik/Kates-Typo-fix
...
Minor typo fix
2018-10-30 13:06:43 -04:00
Neerti
3a9c13b937
Ports Vote to SMC
2018-10-20 01:53:13 -04:00
