izac112
02aea97e36
changes
2024-12-04 15:18:34 +01:00
izac112
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
izac112
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
79d6403328
Maintenance day update (2024-10-22) ( #16507 )
...
* Fix crew manifest (#16502 )
* ability master bandaid (#16505 )
* Ports over configuration controller (#16484 )
* Ports over configuration controller
* Fixes
* Manual path fix
* patch (#16490 )
* patch
* .
* SQL Fix
* Post-rebase fix
* Added missing examples
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
---------
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com >
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-22 19:29:14 +02:00
Kashargul and GitHub
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
Guti
6e9f1c0276
Oops
2024-10-04 18:26:48 +02:00
Guti
30a9b8d554
TGUI Vote Panel
2024-09-29 11:15:44 +02:00
izac112
bcad22ac98
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-06-23 19:20:09 +02:00
Aronai Sieyes
85c31e9fda
WIP fix of this PR
2021-06-21 19:29:43 -04:00
MarinaGryphon and VirgoBot
385fa640af
Linter diagnostics + bans non-var relative pathing
2021-06-20 18:16:45 -04:00
izac112
7fc7803e53
Update autotransfer.dm
2020-05-20 23:45:55 +02:00
izac112
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
Aronai Sieyes
d1e7821b15
VS: Language issues
...
These issues don't prevent compiling, but are strange issues nonetheless.
2020-05-09 16:53:59 -04:00
Arokha Sieyes
323f7e651f
Fix/rename some timing stuff
2020-05-08 01:51:52 -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
92f21e7daa
Autotransfer uses wrong subsystem
2020-03-30 16:11:30 -04:00
Shadow-Quill and GitHub
463b41cd06
Grammar
2020-03-24 21:42:01 -05:00
TheFurryFeline and GitHub
9cfabc32a7
New Message, No Votes Anymore
...
Title.
Changelog Notes:
- Changes the roundvote message into a warning that one hour is left of the shift.
2020-03-23 19:11:16 -04:00
Unknown
baa24b9838
Number of votes
2020-03-22 09:23:33 -04:00
Repede
23b6d8cb3c
Better config for extended shift restart
2020-02-09 03:16:52 -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
Unknown
03dcb65c01
Fixes most of the issues
2019-03-27 00:38:44 -04:00
Neerti and Novacat
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Hawk_v3
2cfaf95e78
Merge branch 'upMaster' into updates
2018-10-21 03:48:41 +01:00
Arokha Sieyes
30a8a3ce31
VS edit merges
2018-10-20 17:37:08 -04:00
Neerti and VirgoBot
3a9c13b937
Ports Vote to SMC
2018-10-20 01:53:13 -04:00
Repede
93cab07a5a
Fixes autotransfer message
2018-06-04 23:26:12 -04:00
Repede
5247cdd059
Fixing votes
2018-03-16 17:46:22 -04:00
Repede
89a34080e3
Voting now 5 times ayy
2018-03-13 18:05:49 -04:00
Kelshark
85f9061592
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/controllers/autotransfer.dm
# code/datums/supplypacks/contraband.dm
# code/datums/supplypacks/munitions.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/reagents/reagent_containers/food/snacks.dm
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/vore/taurs_vr.dmi
# vorestation.dme
2018-01-24 19:52:12 -05:00
Arokha Sieyes
447929ba53
Clarify extend vote wording
...
Last? Only.
2017-12-27 18:19:18 -05:00
izac
5b47ccec2e
Correct for our change in the crew transfer
...
Signed-off-by: izac <izac10@live.com >
2017-12-01 10:56:45 +01:00
Cameron653 and GitHub
3adaac4d91
Update autotransfer.dm
2017-08-28 17:09:41 -04:00
Cameron653 and GitHub
fa780f8f71
Update autotransfer.dm
2017-08-28 17:09:06 -04:00
Cameron653 and GitHub
45edf4cb02
Update autotransfer.dm
2017-08-27 19:42:59 -04:00
Cameron653 and GitHub
d896a030f8
Adds global announcemment
2017-08-27 19:31:23 -04:00
killer653
55a9cf7de9
Correct way.
2017-08-26 22:50:11 -04:00
Cameron653 and GitHub
db875f67ec
Update autotransfer.dm
2017-08-26 22:39:25 -04:00
PsiOmegaDelta and Yoshax
a3f8bc815e
Round start timer now remains at 0 until the round actually starts.
2016-04-20 15:27:59 +01:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
DJSnapshot
983ca2d5e3
Fix for reported issue with the transfer_controller causing a runtime error. Also included is a debug controller for the transfer_controller
2013-11-21 17:44:31 -08:00
DJSnapshot
9936a9251f
Helps to add the actual new file.
2013-11-17 11:55:57 -08:00
izac112