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
4879a52633
Server maint subsystem ( #16518 )
...
* upports server maint subsystem
* fix runtime in admin z narrate
* .
* sorts them verbs
* .
* .
* Update code/controllers/subsystems/statpanel.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
* Update code/controllers/subsystems/server_maint.dm
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
---------
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com >
2024-11-04 11:44:44 +01:00
7be625e0cb
some more small things ( #16491 )
2024-10-18 23:36:19 +02: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
f0a8d083d8
Merge branch 'master' into span_rework
2024-10-03 23:19:42 +02:00
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
30a9b8d554
TGUI Vote Panel
2024-09-29 11:15:44 +02:00
7c8bb85de3
Whitespace Standardization [MDB IGNORE] ( #15748 )
...
* Update settings
* Whitespace changes
* Comment out merger hooks in gitattributes
Corrupt maps would have to be resolved in repo before hooks could be updated
* Revert "Whitespace changes"
This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.
* Whitespace again minus example
* Gitignore example changelog
* Restore changelog merge setting
* Keep older dmi hook attribute until hooks can be updated
* update vscode settings too
* Renormalize remaining
* Revert "Gitignore example changelog"
This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.
* Attempt to normalize example.yml (and another file I guess)
* Try again
2024-02-20 11:28:51 +01:00
9402b12322
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-08 18:19:52 +01:00
e4b62dfa35
remove static chat colour tags
2024-01-21 12:34:53 +01:00
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
779b4db5c0
Added missing href tokens
2022-12-14 21:08:49 +01:00
71d069887c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-08 15:49:48 +02:00
06c9b26252
Input Conversion Part 1
2022-06-19 03:05:03 +02:00
476cee1626
ANOTHER OOPS!
2022-06-11 21:54:00 -04:00
e4d0c2afec
Oops
2022-06-11 21:50:42 -04:00
c30233d1f7
Revision
2022-06-11 21:43:53 -04:00
ec39d3117d
Restart vote tweaks
...
Makes it so you can only trigger restart votes if there are no staff on/if you are staff
2022-06-11 20:52:50 -04:00
4e14241cb8
Voreupdate
2021-07-21 15:16:48 +02:00
34982728cb
Add 'as anything' to various for loops
2021-07-20 12:39:59 -04:00
f6878064b3
Merge branches 'izac' and 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-07-04 22:09:57 +02:00
4c12504e3b
Replace list inputs with tgui_input_list
2021-06-26 10:39:56 -04:00
0da0c54388
Convert almost all alert() to tgui_alert()
2021-06-25 17:03:35 -04:00
2f2f9ef5bb
edit comment
2020-04-17 18:49:50 -05:00
9be061fc31
As per request.
...
Co-Authored-By: Izac Joof Forsgren <izac10@live.com >
2020-04-17 18:49:00 -05:00
5307de17df
Merge branch 'master' into MatterVote
2020-04-17 06:22:28 -05:00
eb157c5bf4
Matteralarm vote~
2020-04-17 03:53:37 -05:00
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
6dc9ecd1af
Fix: Only call autogamemode vote once.
2020-04-10 11:41:38 -04:00
c467445cba
Adds confirmations message to cancel vote ( #6945 )
2020-04-04 22:29:43 -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
cb8548f5af
Fully Implements R_EVENT for Event Managers
2020-03-12 15:01:50 -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
6d1258bc11
Edit
2019-11-19 22:58:59 +01:00
f43601eecd
Changes it from "an additional hour" to "an additional four hours"
2019-11-19 22:55:33 +01:00
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
30f751b23f
Update vote.dm
2019-10-11 02:29:58 -04:00
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
5f92049ed7
Yeah no, we like our long rounds.
...
Minimal changes to code.
2019-04-22 21:05:56 +01:00
557a36e2e5
Conflict Resolution
2019-04-18 13:47:28 -04:00
7f97c8e7cc
Makes transfer always occur if nobody is playing.
2019-04-18 13:45:57 -04:00
0e6c82ed60
Conflict Resolution
2019-03-27 12:05:38 -04:00
dfbd0bd72b
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
549adf6baf
Merge pull request #5719 from lbnesquik/Kates-Typo-fix
...
Minor typo fix
2018-10-30 13:06:43 -04:00
3a9c13b937
Ports Vote to SMC
2018-10-20 01:53:13 -04:00
izac112