Commit Graph

3284 Commits

Author SHA1 Message Date
CitadelStationBot
0796b5d503 Merge pull request #3742 from Citadel-Station-13/upstream-merge-31939
[MIRROR] Adds customizable sound emitters for admin use
2017-11-02 04:07:57 -05:00
CitadelStationBot
429961fcea Merge pull request #3741 from Citadel-Station-13/upstream-merge-32271
[MIRROR] Rename brown gas to nitryl
2017-11-02 04:07:48 -05:00
CitadelStationBot
9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942
[MIRROR] Shuttle rotation refactor and significant performance upgrade
2017-11-02 04:06:31 -05:00
LetterJay
d0c1964181 Update shuttle.dm 2017-11-02 02:21:40 -05:00
Ashe Higgs
045d34aa13 Adds customizable sound emitters for admin use (#31939)
When I ran the Colosseum of Fools event a while ago, I used sounds I had locally to spice up the event and make it unique, but I ran into the issue of there being no easy way to play sounds in flexible ways while preventing people who don't want to hear them from being included.

Adds sound emitter objects, editable by admins through a handy UI, that allows them to play sounds in a variety of flexible ways. The following things can be manipulated by any admin by clicking on the sound emitter:

Label (maptext)

Sound File is chosen by navigating to the file like normal sound playing

Sound Volume is a percentage between 1 and 100

Mode dictates how the sound is played and can either be local (played at that location like a normal in-game sound) or direct (played directly to players like admin sounds)

Range dictates how far players need to be to hear the sound; this includes Radius (all players within a specified amount of tiles), Z-Level (all players on the same z-level), and Global (all players.)

Sound emitters can be examined by any ghosts (they're invisible to normal players) to see the info about them, but only admins can edit their properties and play sounds with them.

This lets admins make very flexible sound emitters that can fulfill a variety of different purposes, like music that only people within 7 tiles can hear or a distant screech of metal that an entire search party on the derelict hears.

In addition to the Play Sound button, alt-clicking the emitter activates it.
2017-11-01 21:37:28 -05:00
nicbn
8aef4f3b57 Rename brown gas to nitryl (#32271) 2017-11-01 21:37:20 -05:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07:00
LetterJay
84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251
[MIRROR] Nerfs peaceborg chain bucklestun
2017-11-01 01:44:55 -04:00
LetterJay
06d6361c98 Merge pull request #3732 from Citadel-Station-13/upstream-merge-32145
[MIRROR] Fixes a camera issue with scout holoparasites
2017-11-01 01:44:27 -04:00
LetterJay
5d46fbb8d3 Merge pull request #3730 from Citadel-Station-13/upstream-merge-32250
[MIRROR] Makes greyscaled cables' color viewable in map editing
2017-11-01 01:44:05 -04:00
LetterJay
7935b22a97 Merge pull request #3728 from Citadel-Station-13/upstream-merge-32109
[MIRROR] Fixes a common runtime on prefs screen
2017-11-01 01:43:41 -04:00
LetterJay
0adcd7eb61 Merge pull request #3727 from Citadel-Station-13/upstream-merge-32196
[MIRROR] Nerfs smoke machine + improves grammar
2017-11-01 01:43:21 -04:00
LetterJay
f8caa2dd78 Merge pull request #3722 from Citadel-Station-13/upstream-merge-32248
[MIRROR] Makes isbanned have an arg for only checking real bans
2017-11-01 01:41:55 -04:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
AnturK
d792624dd8 Nerfs peaceborg chain bucklestun (#32251)
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
2017-10-31 17:40:03 -05:00
oranges
486982b422 Merge pull request #32145 from PKPenguin321/patch-16
Fixes a camera issue with scout holoparasites
2017-10-31 15:32:04 -05:00
oranges
59f3a714e2 Merge pull request #32250 from ninjanomnom/map-cable-color
Makes greyscaled cables' color viewable in map editing
2017-10-31 15:30:45 -05:00
oranges
aa88e61169 Merge pull request #32109 from ACCount12/runtime_a_day
Fixes a common runtime on prefs screen
2017-10-31 15:21:20 -05:00
FrozenGuy5
adca482008 Nerfs smoke machine + improves grammar (#32196)
* https is the way to go

* changes links to https:// instead of http://

* tsk tsk byond

* Nerfs smoke machine + improves grammar

* requested changes

* i can spell
2017-10-31 15:19:08 -05:00
Emmett Gaines
5118e6efe9 Makes isbanned have an arg for only checking real bans (#32248)
* makes isbanned have an arg for only checking real bans

* makes it return false if invalid data is passed in on a real bans check
2017-10-31 15:10:15 -05:00
Mercenaryblue
16c2f8f4c7 Honkbots Tablecrafting
You can now tablecraft Honkbots.
2017-10-31 12:26:59 -05:00
LetterJay
6e4e0e4f2d Merge pull request #3709 from Citadel-Station-13/upstream-merge-32118
[MIRROR] actually fixes not being able to stop wagging your tail this time
2017-10-31 03:03:58 -04:00
LetterJay
1d992f2dfd Merge pull request #3705 from Citadel-Station-13/upstream-merge-32222
[MIRROR] Ignore verb now also shows ghost names
2017-10-31 03:02:05 -04:00
LetterJay
59bea99c4b Merge pull request #3702 from Citadel-Station-13/upstream-merge-32123
[MIRROR] Removes statues from the gold slime pool
2017-10-31 03:01:34 -04:00
LetterJay
a0f3edf6ca Merge pull request #3701 from Citadel-Station-13/upstream-merge-32150
[MIRROR] Meteor gating tweaks
2017-10-31 03:00:49 -04:00
LetterJay
32fb136bf0 Merge pull request #3589 from Citadel-Station-13/upstream-merge-31855
[MIRROR] Dullahans
2017-10-30 23:54:25 -04:00
LetterJay
09a198fb65 Merge pull request #3694 from Citadel-Station-13/upstream-merge-32225
[MIRROR] Deterministic output slots for smartfridges
2017-10-30 23:32:39 -04:00
LetterJay
53314289c8 Merge branch 'master' into upstream-merge-31855 2017-10-30 23:31:13 -04:00
LetterJay
1092b020f4 Merge pull request #3690 from Citadel-Station-13/upstream-merge-32214
[MIRROR] Fixes old simple animal humanoid issues
2017-10-30 22:14:32 -04:00
LetterJay
df6bd6fa4c Merge pull request #3682 from Citadel-Station-13/upstream-merge-32140
[MIRROR] Fixes filling smoke machines with pills
2017-10-30 22:11:44 -04:00
LetterJay
6963ad2aac Merge pull request #3680 from Citadel-Station-13/upstream-merge-32041
[MIRROR] Excludes clockwork wargolems from golem mutation toxin, nerfs normal clockwork golems
2017-10-30 22:11:33 -04:00
LetterJay
49dce5c9ea Update emote.dm 2017-10-30 21:09:00 -05:00
LetterJay
ca1581bd11 Update emote.dm 2017-10-30 20:35:24 -05:00
kevinz000
93f39805e9 actually fixes not being able to stop wagging your tail this time 2017-10-30 15:24:38 -05:00
Jordan Brown
909f1ba244 Merge pull request #32222 from AnturK/ignoreprovement
Ignore verb now also shows ghost names
2017-10-30 15:06:37 -05:00
jughu
b6fea33316 Removes statues from the gold slime pool (#32123)
* Update statue.dm

* Update statue.dm
2017-10-30 14:53:56 -05:00
Jordan Brown
ba1d3fd2c2 Merge pull request #32150 from MrStonedOne/patch-442
Meteor gating tweaks
2017-10-30 14:51:44 -05:00
vuonojenmustaturska
5bd7184d9c Deterministic output slots for smartfridges (#32225)
* a spooky commit

* It is too late, the skeleton is already inside you

* mexican river dolphins for halloween 2018

* Compiler warnings for halloween 2018
2017-10-30 14:35:26 -05:00
bawhoppen
f8bd9ecf9c Fixes old simple animal humanoid issues (#32214)
* fixes issue

* ignore that

* Spacebattle doesn't even open in DM

* Conflicts fixed for real

* Fixes pathing weirdness

* wonderful
2017-10-30 06:50:04 -05:00
LetterJay
b6a04b6649 Merge pull request #3689 from Citadel-Station-13/CharacterCreation
Fixes character issues on creation
2017-10-30 07:02:15 -04:00
LetterJay
ed2208a7ea Merge pull request #3687 from Michiyamenotehifunana/CRITICAL-SPRITER-CRAP-NERFS
CRITICAL BALANCE FIXES TO CITADEL'S GUNS
2017-10-30 06:33:15 -04:00
LetterJay
e0cbc7b9a2 Fixes character issues on creation 2017-10-30 05:32:06 -05:00
Michiyamenotehifunana
d0a28fcd62 NERF EVERYTHING
EVERYTHING OP NERF NOW also what the fuck how does a whole playerbase ignore balance issues for a whole fucking month only for a vilified member of the community to be so fucking helpful
2017-10-30 15:01:37 +08:00
LetterJay
969f92fb58 Delete nudge.py 2017-10-30 01:48:48 -05:00
LetterJay
fba46cd0e5 Delete server_tools.dm 2017-10-30 01:48:42 -05:00
LetterJay
48cc684de0 Update golems.dm 2017-10-29 22:41:23 -05:00
LetterJay
b0573cc67f Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
2017-10-29 23:38:55 -04:00
LetterJay
715a2fb918 Merge pull request #3677 from Citadel-Station-13/upstream-merge-32080
[MIRROR] Ice Spiders now use frost oil instead of toxin
2017-10-29 23:37:58 -04:00
PKPenguin321
e486038c2e Fixes filling smoke machines with pills (#32140)
Fixes #32102

Checks for the OPENCONTAINER flag after seeing if the object being used to fill the smoke machine has reagents in it
2017-10-29 16:01:34 -05:00
LetterJay
2715fa9953 Merge pull request #3679 from Citadel-Station-13/upstream-merge-32174
[MIRROR] Halloween race fixes
2017-10-29 16:05:19 -04:00