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
Mloc-Argent
e9bf414820
Refactors code to work with BYOND 500.
...
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
/obj/item/color is now item_color
/obj/atmospherics/color is now pipe_color
simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-22 12:39:48 +01:00
Kilakk
9bd3f2997c
Added in an awesome fax machine sprite by Cajoes
2013-09-18 19:41:29 -04:00
Kilakk
e1192fea75
World loop removed successfully
2013-09-16 17:12:36 -04:00
SkyMarshal
f76f5ae532
First pass on experimental change that allows zones to "Sleep"
2013-09-11 11:43:42 -07:00
Zuhayr
7ab7a61812
Merge resolution, using dev-freeze map.
2013-09-09 21:59:47 -07:00
Zuhayr
c7942b7eaf
Merge pull request #3651 from SkyMarshal/airfixes
...
ZAS update, needs testing.
2013-09-07 05:46:04 -07:00
SkyMarshal
7d0c1f047a
There we go, rebuilding works right now. Also has a slightly bugged verb that demonstrates how the rebuilding works, but you need to somehow prevent a zone from updating for it to show more than one "id"
2013-09-06 21:03:46 -07:00
Zuhayr
b0d7a95189
Merge pull request #3644 from DJSnapshot/master
...
Gave mods dsay command and unique dsay identifier
2013-09-03 22:46:39 -07:00
SkyMarshal
e8f9d19c75
Completed ZAS rework. Needs testing, and consideration to make zones sleep.
2013-09-03 20:25:03 -07:00
DJSnapshot
2c41ad1429
Gave Mods dsay command and unique dsay identifier
2013-09-03 14:10:21 -07:00
Erthilo
3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
Erthilo
88a45d3cbf
Job whitelist fix.
2013-09-02 17:51:49 +01:00
Mloc-Argent
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
Erthilo
b75d97a488
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/machinery/kitchen/gibber.dm
code/modules/mob/living/carbon/human/inventory.dm
code/modules/reagents/reagent_containers/hypospray.dm
maps/tgstation2.dmm
2013-08-31 17:45:31 +01:00