Commit Graph

147 Commits

Author SHA1 Message Date
SkyMarshal e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
YotaXP b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
ZomgPonies 2a90d59001 Fixing up security level text 2014-01-08 02:52:35 -05:00
d3athrow 64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
ZomgPonies aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
Mark Aherne (Faerdan) 0a29d579c6 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	nano/js/libraries/2-jsviews.js
	nano/templates/chem_dispenser.tmpl
	nano/templates/telescience_console.tmpl
2014-01-05 00:48:28 -05:00
ZomgPonies 212039f0c3 Better runtime logging 2014-01-03 20:37:20 -05:00
ZomgPonies 17877b2bf3 Continuous rounds fix? 2013-12-30 12:58:52 -05:00
ZomgPonies 3b346dea27 Assistant Limiting 2013-12-30 12:20:08 -05:00
ZomgPonies 4c7fa06c23 Colored Windows 2013-11-30 16:33:53 -05:00
ZomgPonies f60b0e610b AntagHUD for admins and ghosts (who cannot respawn) 2013-11-30 06:39:04 -05:00
ZomgPonies 1f31f91afa Final ZAS BS12 fixes, not touching it anymore :) 2013-11-08 10:08:10 -05:00
ZomgPonies 0e201cc4a5 Going back to BS12 ZAS, permanently 2013-11-08 09:51:22 -05:00
ZomgPonies 900262ec9c ZAS revert fixes 2013-11-07 16:05:46 -05:00
ZomgPonies 0227baa319 Reverting ZAS back to /vg/ style 2013-11-07 07:13:27 -05:00
ZomgPonies 130134a7a3 Adding Ice back to vanilla BS12 ZAS 2013-11-07 06:48:47 -05:00
ZomgPonies e4a82dfda8 ZAS switched from /vg/ to BS12 2013-11-06 20:21:59 -05:00
ZomgPonies c5ebe7acaa Added 5 new types of random events 2013-11-05 08:08:01 -05:00
ZomgPonies ac87641781 DB based job/species whitelist system 2013-09-29 20:59:20 -04:00
ZomgPonies 20444650a9 Autovote System 2013-09-26 06:46:33 -04:00
ZomgPonies 6a8c00ea94 New clownplanet -> Gateway 2013-09-22 20:00:44 -04:00
ZomgPonies 55c8471b91 Voting tie fix 2013-09-13 13:29:41 -04:00
ZomgPonies c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00
SkyMarshal 94fc06d0df Temporary fix for ZAS processing twice per time interval. 2013-09-03 00:41:46 -07:00
Zuhayr cd30be7067 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-06 07:40:21 -07:00
Mloc-Argent 9a5a1dc82c Made IRCbot's password and host a config option.
Added a hook to send a message to the bot when a round starts.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-08-05 14:07:06 +01:00
Kilakk 2eae729426 Absolute paths for shuttle controller 2013-08-04 00:19:37 -04:00
Kilakk 603fa03826 Shuttle doors will now close and lock upon departure 2013-08-03 23:39:51 -04:00
SkyMarshal 72c331bfa7 Several ZAS fixes.
Adds insulation to doors, modifiable by admins from the ZAS setting panel.
Fixes a logic error with connections.  (I am dumb some days)
Improves the runtime detection and reporting.
Improves "zone info" debug verb.
2013-07-25 21:34:12 -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
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
Ispil 4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07: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 11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
Conflicts:
	code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
Spamcat 10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Whitellama bf953679c7 No more placeholder antags, and WIP space ninja gamemode stuff 2013-06-25 16:49:53 -07:00
meyar 6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00
SkyMarshal 9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -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
Kilakk 13045af61a Adds a crew transfer notice for new players
Adds the "The station is currently undergoing evacuation procedures"
notice for new people trying to join when there's a crew transfer going
on.
2013-06-16 12:38:38 -04:00
cib 4e0c68b88a Added a configuration option that allows putting the .rsc on external servers. 2013-06-11 21:28:59 +02:00
SkyMarshal 39df196edc Fixed disposal issue.
Delayed Jungle setup until after air master initializes
Master controller now properly ceases atmos simulation if runtimes occur (and are detected).
Cleanup more ZAS stuff.  FEA_system.dm, ZAS/ZAS_Turfs.dm, ZAS_Zones.dm.
Canisters now autoconnect to portables connectors on creation.   (Fixes airlocks not having attached canisters)
Doors can now be made which respect directional door types (e.g. windoors and directional firelocks) and is handled better.
2013-05-21 23:12:47 -07:00
cib 914a9079f0 Added serithi's soundbits as mode sound announcements. 2013-05-19 05:56:18 +02:00
cib fc20393b60 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature
Conflicts:
	baystation12.dme
2013-05-19 05:54:14 +02:00
cib be197afc77 Added system for newscaster events.
This way people can write stories, separated into several pieces, which will be announced through the newscasters over the course of the round.
2013-05-18 13:06:16 +02:00
cib 0da9a4538e New debug log system.
You can as admin toggle debug messages, VERY useful for devs and debugging the main server.
2013-05-18 10:02:37 +02:00
Mordeth221 09a41d83cc New less obnoxious vote noise 2013-05-17 17:44:39 +02:00