Commit Graph

73 Commits

Author SHA1 Message Date
Kelenius 9aac404c73 Cleans up and updates votes
Absolute pathing, overall cleanup.
Removed two useless vars, simplified process().
Defines instead of strings.
Added "unvote" option that removes your vote.
Vote window now sized according to amount of options.
Added vote controller to debug controller list.
2016-03-07 20:41:39 +03:00
Zuhayr 7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr 98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
GinjaNinja32 7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
GinjaNinja32 0bd51d2712 make vote window closeable via normal means 2015-12-24 05:28:18 +00:00
PsiOmegaDelta 77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
PsiOmegaDelta 5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
2015-07-27 10:20:20 +02:00
PsiOmegaDelta 0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
PsiOmega 2d24960603 Fixes #9894 some more.
Ensures the vote sanity check is done first, before any change of vote counts.
2015-07-26 10:45:05 +02:00
PsiOmegaDelta 9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
2015-07-11 10:58:49 +02:00
Kelenius 879fc98a8c Fixes #9894 2015-07-09 11:50:42 +03:00
Zuhayr 48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
Chinsky e5a8eb2dfc Actually renames 'going' var.
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
Zuhayr 445056ba5f 'Fixes' #9395 2015-05-30 03:59:54 +09:30
Kelenius 5fac67ea4e Adds a voting link to the vote notification 2015-05-17 13:33:49 +03:00
volas 5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
Zuhayr 4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr 98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Zuhayr 8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Amunak 7de862cfe1 Fixed non-gamemode votes being unusable
Hopefully this doesn't break something else.
2014-12-13 07:21:09 +01:00
Amunak 7411d1c38a Bringing back Secret.
Hopefully this fixes my previous fix that managed to remove Secret from vote options, because it's not an actual gamemode.
2014-12-12 21:36:59 +01:00
Amunak 47a3c717e1 Fixes mercenary mode showing up as nuclear in vote
All gamemodes in the vote just take the actual game mode name instead of the config name.
2014-12-12 04:20:05 +01:00
PsiOmega 59aa4dfcc6 ERT and Xenobiology security HUD icons
Treats ERT members as officially recognized Central Command personnel.
Adds missing Central Command secHUD icon. Adds a temporary icon for Xenobiologists.
2014-11-21 14:46:54 +01:00
Zuhayr cec617a414 Merge resolution, compile fixes with outdated glass paths/map. 2014-11-19 23:17:25 +10:30
DJSnapshot b078365f66 vote powers r 4 admons only 2014-11-17 15:18:22 -08:00
PsiOmega 6ec31fc48e Fixes #6881
Automatic votes do not have to wait for vote cooldown.
2014-10-29 15:19:35 +01:00
Ikmachek adc147bcc0 Reduced vote alert noise by half, now easily editable by an arg 2014-09-30 09:28:51 -04:00
Zuhayr 005ac89aad Tweaks to previous commit. 2014-07-25 23:41:41 +09:30
Zuhayr 19cfe8940c Added table layout to vote form. 2014-07-25 23:32:05 +09:30
Kelenius a7748c8542 Adds amount of required players to gamemode vote. 2014-07-25 17:05:15 +04:00
Mloc-Argent 5f8c6dfd9a voting: failed gamemode votes will undelay too
Moved the undelay code in voting.dm out of the success check, as
failures should get undelayed too.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-04-07 19:42:06 +01:00
Segrain 55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03: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 b75380985e Using a better method to handle autotransfers. Old method was silly. 2013-11-17 11:54:43 -08:00
DJSnapshot aeff49f742 Small fix so voting isn't always shouting at you for not being an admin or mod. 2013-10-26 22:49:16 -07:00
DJSnapshot f956971fdf Small change to code. (Was locking up game ticker.) 2013-09-29 22:13:58 -07:00
DJSnapshot 1a48a2b6b0 Auto-transfer voting! 2013-09-29 12:05:10 -07:00
DJSnapshot dda4080434 Bugfix for gamemode vote delay 2013-09-29 11:57:28 -07:00
DJSnapshot caa6cd6c8a votes now show number of votes, no longer mute OOC, and show results. It is no longer possible to call a crew transfer during red/delta alert, and a new proc called autotransfer() has been added, but has yet to have anything to trigger it. 2013-09-24 23:41:21 -07:00
Segrain d658b256e3 Fix for announcing gamemode ties. 2013-09-13 19:42:54 +03:00
DJSnapshot 2525f4f8aa Moved hide_mode vars to global ticker instance. 2013-08-23 06:38:22 -07:00
DJSnapshot 7265509b1d Added vars to change hide mode. 2013-08-23 06:22:07 -07:00
DJSnapshot 4bd67e83b8 Changed vote settings to game mode votes other than extended will not be announced. 2013-08-23 05:47:45 -07:00
Kilakk afeb753f8e Cleaned up vote oocmute a tad 2013-07-21 19:26:05 -04:00
Zuhayr 78653b3175 Removes visible tallies from votes. 2013-07-07 02:42:28 -07:00
Zuhayr e9210b0701 Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting. 2013-07-07 02:28:34 -07:00
Jim Apples ec43741f2f Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC.
Signed-off-by: Jim Apples <cheeckan@gmail.com>
2013-06-21 14:40:36 +01:00
Kilakk 516c2697cd Adds auto OOC mute for crew transfer votes 2013-06-19 19:48:03 -04:00