Commit Graph

18 Commits

Author SHA1 Message Date
Miniature
46d6cbdcd0 Fix for votes being none mode 2012-02-05 18:51:40 +10:30
Hawk-v3
27b43d532e Merge pull request #345 from SkyMarshal/master
Hallucinations and final parts of the fingerprint system
2012-02-02 10:42:45 -08:00
Tastyfish
4fcda439a7 doing a custom vote, aborting it, and starting a new one appended the choices to the choices of the old one. 2012-02-02 04:38:55 -05:00
SkyMarshal
2ed57e0cc6 Finished up the last parts of my fingerprints work. Added a rag which lets you smudge away prints, and sinks do the same.
Added hallucinations properly.
Added LSD (with hallucinations.)
Remapped slightly.
2012-02-02 00:35:48 -07:00
Tastyfish
343832e431 made it so nar-sie can't be objective if < 10 players, due to it being impossible
also, made piano moveable
and cleaned up custom vote code slightly more
2012-01-01 16:44:57 -05:00
Tastyfish
c654a3d8d8 fixed derp on vote announcement for custom vote 2011-12-30 23:41:06 -05:00
Albert Iordache
39b6dd57e0 Removed and commented out the last traces of goon auth. code 2011-12-30 23:28:14 +02:00
Tastyfish
0e0da0bdbb custom votes 2011-12-26 11:24:28 -05:00
Miniature
701ea98e6d Fixed a vote runtime, hopefully this makes it delay start (probably won't tho) 2011-12-23 19:14:58 +10:30
Miniature
2159409d53 Merge branch 'master' of git://github.com/Baystation12/Baystation12
Conflicts:
	code/game/vote.dm

Because I did it derpily.
2011-12-03 19:30:28 +10:30
Miniature
f62eccc76b Merge branch 'master' of git://github.com/Abi79/tgstation13-git
Conflicts:
	baystation12.dme
	code/defines/mob/mob.dm
	code/defines/obj/vending.dm
	code/game/atom_procs.dm
	code/game/dna.dm
	code/game/machinery/computer/aifixer.dm
	code/game/vote.dm
	code/modules/chemical/Chemistry-Machinery.dm
	code/modules/chemical/Chemistry-Reagents.dm
	code/modules/mob/living/carbon/metroid/life.dm
	html/changelog.html
	icons/obj/stationobjs.dmi
	interface/skin.dmf
	maps/tgstation.2.0.8.dmm
2011-12-03 19:28:10 +10:30
CompactNinja
79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping.
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
2011-12-02 21:18:29 +10:30
Miniature
e1a254c34f Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json) 2011-12-02 15:47:42 +10:30
petethegoat@gmail.com
80607987da Quick fix to stop gamemode votes restarting the world if they finish before round start.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2581 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-30 16:01:22 +00:00
Head
43d71282e0 Added back json support / restart notice
should fix unnecessary restart after gamemode change before round start
2011-11-29 15:45:01 +01:00
baloh.matevz
1f9a77c377 Update to feedback gathering:
- Rounds that end in invalid ways will now be logged,
- Round results are logged

- Rounds that don't end with a code-determined reboot will still not log at all (so rounds that end in a crash will not log at all - not even round start or mode.)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2457 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-30 18:42:19 +00:00
n3ophyt3@gmail.com
1aca6254d4 The great verb retabbening.
Assigned categories to assorted verbs that lacked them. Commands tab is now more or less gone. Instead, things are in "IC" for things like say, whisper, me, that are inherent to you, "OOC" for things like OOC chat, and "Objects" for verbs originating from the world around you. I suppose for those non-admins in the audience, you now also get an "Admin" tab, because I stuffed adminhelp and adminwho in there.

This change was only to verbs defined as verbs in the code, procs that are assigned to things as verbs are far more numerous and harder to isolate, but also mostly admin-related.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1234 316c924e-a436-60f5-8080-3fe189b3f50e
2011-03-22 21:29:42 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00