Commit Graph

1146 Commits

Author SHA1 Message Date
Zuhayr
b638388bdd Uncommented ninja block in Check Antags. 2013-12-27 10:48:37 +10:30
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2013-12-13 19:13:43 +00:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08:00
Ccomp5950
157b67404c Added Telesci to the investigate list.
Admins will now be able to select it and view who used the telescience machines
2013-12-05 04:21:18 -06:00
Kilakk
d2c07184f7 Merge remote-tracking branch 'upstream/dev' into dev-radio
Conflicts:
	maps/tgstation2.dmm
2013-12-03 21:24:03 -05:00
Chinsky
0074452f29 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-03 19:42:17 +04:00
Kilakk
13abdf9fdc Moved the CentComm channels onto their own tcomm network thing
* 144.1 and 144.3 are accessible through regular headsets, silly people were using them to listen in on response teams
* Moved the ERT and Deathsquid channels to 134.5 and 134.1 respectively
* Created presets for a tcomms setup on the CentComm zlevel
2013-12-01 18:58:16 -05:00
Rob Nelson
53c2aff420 DNA2 - A recode of DNA
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
2013-12-01 00:04:27 -08:00
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master
merge master into dev-freeze
2013-11-30 15:22:31 -08:00
Ccomp5950
3be474bab8 Admin request: Added ability to jobban players from becoming Dionaea nymph 2013-11-28 22:35:12 -06:00
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
Mloc
d8683f2d39 Revert "Merge pull request #3965 from jack-fractal/dev"
This reverts commit fa57b76f25, reversing
changes made to 40ee2278ed.

Signed-off-by: Mloc <colmohici@gmail.com>
2013-11-25 11:59:57 +00:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
jack-fractal
ce18d47778 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	baystation12.int
	code/controllers/verbs.dm
2013-11-23 11:58:50 -05:00
jack-fractal
5df2797b86 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	baystation12.int
2013-11-22 20:30:23 -05:00
jack-fractal
3eb8d1c2b9 - lots of debugging
- modifying how runes are called to use reflection
- adding highlander code to make sure that there can only be one mask
- adding Spread Shadows spell
- adding cult admin investigation log
- adding mask icon
2013-11-22 20:09:24 -05:00
Zuhayr
ae0605db42 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-11-22 22:18:44 +10:30
Ccomp5950
7be20c0986 AntagHUD's player verbs will now disappear from the players view if disabled by admin or by configuration options.
Poor guys won't know what they are missing!

Admins/Mods will still have the verb viewable.
2013-11-19 05:36:40 -06:00
Ccomp5950
457835db38 Admin request: Jobbans for IA and ERT 2013-11-17 18:16:42 -06:00
jack-fractal
cf5012ce1d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-17 16:30:42 -05:00
jack-fractal
c6ec432904 - major update to all systems
- creating the mask entity
- modifying the code for cult icons
- updating the camera net
- adding visibility network updates to all mobs
- unifying the culting and deculting process
- adding "Make Mask" function to Player Panel
2013-11-17 16:23:36 -05:00
Ccomp5950
340532dc55 String fix on adminverb
Added holder checks so admins can use antagHUD regardless of restrictions.
2013-11-17 13:16:55 -06:00
Ccomp5950
59bb2357b6 Included JobBan menu and systems for AntagHUD 2013-11-17 17:29:30 +00:00
Ccomp5950
a56103c151 Added Adminverbs for turning off and on the various items needed.
Also added the proc get_ghosts() with 2 versions of output, it defaults to returning a mob list but can be set to return a list for use with an input window.
2013-11-17 17:29:30 +00:00
Ccomp5950
dbf24606bd The Ghost AntagHUD Feature.
Created configurations for Server Admins to be able to toggle it within default config.

Modified my previous AdminVerb that allows respawns to bypass the limitations of the restrictions while also letting the admins know if the ghost has used AntagHUD

Created restriction checks for various forms of joining the round and if administrators/hosts have restricted AntagHUD users from joining the round they will not be able to.

To Do:
Create Adminverb for toggling restrictions to also be able to toggle everyones ability to use antagHUD for a round.
Create a method for "Job Banning" users from using antagHUD.
2013-11-17 17:29:29 +00:00
Ccomp5950
1a3a599087 Created a proc that sets the ghosts timeofdeath to a time 30 minutes before round start, this does not effect the ghosts original body, just the ghost mobs.
Since ghosts may not respawn within 30 minutes of death this allows mods/admins to bypass it for ghosts and sends the player a message letting them know they can respawn now
as well as reminding them to roleplay correctly.

Before this admins were editing the variable directly.
2013-11-14 13:26:12 -06:00
DJSnapshot
7665a1a00e Merge pull request #3895 from Baystation12/master
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Mloc-Argent
8005d8bf2b More power to devs. (this is a bad idea)
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-04 21:31:29 +00:00
DJSnapshot
c20c84b328 Dun goofed 2013-11-04 13:10:33 -08:00
DJSnapshot
15a2bcc54f Fix so bans can work again. 2013-11-04 13:07:03 -08:00
Mloc-Argent
4ef079aba3 SDQL and SQDL 2 from Lunacode.
SQL syntax things for datums. 'UPDATE /obj IN world SET color = "pink"'

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-11-04 16:16:53 +00:00
DJSnapshot
231131c1f5 Merge pull request #3814 from Baystation12/dev-freeze
0.1.5 merge.
2013-11-03 14:02:16 -08:00
DJSnapshot
11f0b1ef92 Fixed delay so anyone with R_SERVER can use it. 2013-11-03 13:31:54 -08:00
jack-fractal
6764c54989 making a generic version of the AI's visibility code so that it can be reused by the Cult Spirits 2013-10-26 16:52:14 -04:00
Segrain
c8fcabc181 Smallfix. 2013-10-24 19:11:04 +03:00
Segrain
4d79764478 Vox wallets. 2013-10-21 05:13:09 +03:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
cad425f2ca Roundend declaration. 2013-10-17 04:07:29 +03:00
Segrain
6184ad729f Cardfix. 2013-10-17 04:01:46 +03:00
Chinsky
d85940ff3b Merge pull request #3775 from DJSnapshot/adminfeatures
expanded mod powers
2013-10-15 00:24:39 -07:00
DJSnapshot
3d83eafbae teensy spot missed. 2013-10-15 00:19:34 -07:00
DJSnapshot
8af4d1eadf Fixed random git bug 2013-10-15 00:14:21 -07:00
DJSnapshot
c7821741c2 Expanded mod powers to include temporary job bans, temporary global bans, muting, and subtle messaging. 2013-10-14 23:48:26 -07:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze
BYOND AKBAR
2013-10-10 02:45:45 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01:00
Chinsky
7555dd0f0b Merge branch 'master' into dev
Conflicts:
	code/setup.dm
2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes.
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-07 20:24:21 +01:00
Mloc
49c0a30301 Merge branch 'master' into dev
Conflicts:
	baystation12.dme
	html/changelog.html
2013-09-26 10:26:03 +01:00