Commit Graph

174 Commits

Author SHA1 Message Date
PsiOmega
87998f7eb1 Fixes #7295.
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Chinsky
9e818ef52f Merge pull request #6983 from PsiOmegaDelta/Event
Event Manager Control
2014-11-12 23:45:02 +03:00
PsiOmega
0602200dd6 Round-end report. 2014-11-10 19:20:16 +01:00
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
bs12
a6934a531b gameticker.dm crash fix
Signed-off-by: bs12 <bs12@bs12.bs12>
2014-11-01 16:17:18 +00:00
PsiOmega
bf1e6af508 Z-Level Compatibility
Now possible to configure 3 different kind of Z-levels.
Station levels: Which Z-levels the station exists on.
Contact levels: Which Z-levels are typically affected by, for example, Code Red which alters the visual state of fire alarms.
Player levels: Which Z-levels a character can typically reach.
2014-10-30 14:29:56 +01:00
Chinsky
bad385e1d1 Merge pull request #6791 from Zuhayr/dev
Removes references to the Syndicate and renames nuclear emergency mode.
2014-10-21 01:13:17 +04:00
Zuhayr
99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr
f31ffb11c2 Fixes #6752 2014-10-18 08:09:50 +10:30
PsiOmega
4f7b32ae4f Round-end summary now also lists job 2014-09-30 10:07:59 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Chinsky
200a1c0d01 Merge pull request #6328 from atlantiscze/malf-explode-fix
Malfunction Explode Fix
2014-09-14 21:48:57 +04:00
Atlantiscze
9ff1f94152 Round end spam fix
- This ensures that "The round has ended" message is shown only once, instead of being spammed under certain circumstances.
2014-09-12 17:24:57 +02:00
PsiOmega
98bc0d5f60 Fixes a bug where people who were in the lobby but not observers were considered non-survivors in shift-end feedback. 2014-09-05 11:00:47 +02:00
PsiOmega
3377ca1bfb Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus. 2014-08-25 07:37:59 +02:00
Zuhayr
9eefdf4db8 A bit of prep work for integegrating player-set backgrounds into gameplay. 2014-08-01 22:54:57 +09:30
mwerezak
9e0562b16c Adds shuttle controller
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.
2014-06-23 22:00:57 -04:00
mwerezak
dc304026a9 shuttle_controller now uses a shuttle datum 2014-06-22 18:10:56 -04:00
mwerezak
e46c3c8834 Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'
2014-06-18 19:37:46 -04:00
mwerezak
63ea6eba0d Adds docking controllers to shuttles
Shuttles dock at round start.
2014-06-09 23:37:37 -04:00
Chinsky
a086043a9b Merge pull request #5116 from mwerezak/round-end
Round no longer ends suddenly
2014-06-02 23:00:48 +04:00
mwerezak
cc4a6e0f26 Fixes config.continous_rounds and adds check 2014-06-01 15:49:13 -04:00
mwerezak
dbe43db59a Round no longer ends suddenly
Instead, a crew transfer vote is called. Also adds cleanup proc to
game_mode.
2014-06-01 14:50:57 -04:00
Zuhayr
825a77b702 Fixes end of round drone spam. 2014-05-31 15:38:10 +09:30
Ccomp5950
7000cce408 Admin Request: Logs now will end in CRLF on unix systems.
Also removed the "SERVER HAS CALLED FOR A VOTE" spam
2014-03-23 02:26:06 -05:00
Segrain
55605624eb Gamemode autovote. 2014-02-03 04:43:38 +03:00
Zuhayr
5709dc2629 Fixes so ladders actually connect and function now. 2014-01-25 04:16:18 +10:30
Mloc-Argent
6095a3a249 Merge branch 'dev' of github.com:Baystation12/Baystation12 into bs12-hooks 2013-11-25 21:17:07 +00:00
Mloc-Argent
33805e639b Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.
Current hooks are "startup", "roundstart", and "roundend".
Most stuff in world/New() has been moved over to the startup hook.
Roundstart and roundend have no hooks yet.

Removed the unused "newbanjob.dm" file and associated verbs/topics.
Bumped RECOMMENDED_VERSION up to 501.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-25 21:16:09 +00:00
DJSnapshot
b75380985e Using a better method to handle autotransfers. Old method was silly. 2013-11-17 11:54:43 -08:00
DJSnapshot
231131c1f5 Merge pull request #3814 from Baystation12/dev-freeze
0.1.5 merge.
2013-11-03 14:02:16 -08:00
DJSnapshot
78055b44a8 Used multi-line comments instead because Mloc and Chinsky didn't like me cheating DM for less characters. 2013-11-01 08:00:38 -07:00
DJSnapshot
13cb84f620 end of 2spookyday event 2013-11-01 07:30:45 -07:00
DJSnapshot
22cbb0fe17 Seekrit halloween update 2013-10-27 15:25:12 -07:00
Chinsky
92625f8384 Merge pull request #3716 from DJSnapshot/bugfix
Auto-transfer voting Redux: Episode 2.
2013-09-30 07:53:49 -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
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01: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
Cael Aislinn
955160e9d6 moves and renames economy files to /modules instead of /wip, cleanup and shuffles of a bunch of code, removes "linked_db" (requirement for financial machinery to be connected to an accounts database)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-09-20 13:35:49 +10: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
Mloc-Argent
08393161c0 Merge branch 'master' into BEF-staging
Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-04 13:08:28 +01:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server.
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-02 23:41:40 +01:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master
Merging master to BEF
2013-05-31 19:49:13 -07:00
Asanadas
c598ac5731 Time to bloat the DB. Added Chris Hadfield's space station cover of Space Oddity. space_oddity.ogg is also a login screen theme. 2013-05-29 13:53:15 -04:00
VitrescentTortoise
d0d51222e1 Allows players to return to lobby if job prefernces unavailable 2013-05-26 18:18:41 -07:00
Cael_Aislinn
950c5a84ab updated roundstart music
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-05 17:15:12 +10:00
Cael_Aislinn
02ace92b04 miscellaneous tweaks to finance machines
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-26 02:59:04 +10:00