shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,283 Commits 5 Branches 0 Tags
c3fab199be58efecf4e33e78af708e44dbe44160
Commit Graph

5709 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
6a796ac32a Merge pull request #3739 from Citadel-Station-13/upstream-merge-32274 
[MIRROR] Ark examine now uses DisplayTimeText
 2017-11-02 04:07:23 -05:00
CitadelStationBot
6d8072e106 Merge pull request #3738 from Michiyamenotehifunana/recolorables-polish 
Polishes code for cit's recolorable assets
 2017-11-02 04:07:11 -05:00
CitadelStationBot
b93d28d9aa Merge pull request #3736 from Citadel-Station-13/upstream-merge-32252 
[MIRROR] Reflector fixes and improvements
 2017-11-02 04:07:01 -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
MoreRobustThanYou
6fbb326242 Makes it so non-admins cannot activate the Ark (#32272) 2017-11-01 21:38:43 -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
MoreRobustThanYou
ebc768e31b Ark examine now uses DisplayTimeText (#32274) 
* Ark examine now uses DisplayTimeText
 2017-11-01 21:36:54 -05:00
LetterJay
2f205af2ac Update preferences.dm (#3691) 2017-11-01 11:38:44 -07:00
Michiyamenotehifunana
d7e0857716 Polishes code for recolorable assets 
Moves things around a bit to hopefully be more optimized and have lower chance of breaking
 2017-11-01 23:33:24 +08:00
LetterJay
d9a29dbda2 Merge branch 'master' into upstream-merge-32307 2017-11-01 07:22:39 -04: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
eb8b49071a Merge pull request #3725 from Citadel-Station-13/upstream-merge-32158 
[MIRROR] Replace most islist calls in components with length()
 2017-11-01 01:42:42 -04:00
LetterJay
0ed96f1d60 Merge pull request #3723 from Citadel-Station-13/upstream-merge-32155 
[MIRROR] Minor optimization for _GetInverseTypeList
 2017-11-01 01:42:07 -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
LetterJay
1574bb6d61 Merge pull request #3721 from Citadel-Station-13/upstream-merge-32241 
[MIRROR] Honkbots Tablecrafting
 2017-11-01 01:41:20 -04:00
LetterJay
18087ee261 Merge pull request #3720 from Citadel-Station-13/upstream-merge-31752 
[MIRROR] Makes varediting pneumatic cannon easier and makes the code less snowflake-y
 2017-11-01 01:41:10 -04:00
LetterJay
839fcfab22 Merge pull request #3719 from Citadel-Station-13/upstream-merge-31769 
[MIRROR] Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring
 2017-11-01 01:40:54 -04:00
LetterJay
d5aa1caca8 Merge pull request #3715 from Michiyamenotehifunana/misc-bug-fixes 
Fixes Mk.37Fs needing permits and Toy NEBs being able to turn into Dual Toyswords
 2017-11-01 01:40:20 -04:00
LetterJay
fec29755ad Merge pull request #3714 from Michiyamenotehifunana/rebalancing-excessive-nerfs 
Further rebalancing of Cit_guns projectiles
 2017-11-01 01:40:08 -04:00
oranges
17873819b3 Adds a temporary workaround for a BYOND bug 2017-10-31 21:20:13 -05:00
ACCount
cfaa6a9cd5 Reflector fixes and improvements 2017-10-31 21:01:45 -05: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
Jordan Brown
55653fa1ee Replace most islist calls in components with length() (#32158) 
islist was used to check if a thing was

A. A list of things
B. 1 thing

length was profiled to be faster
 2017-10-31 15:12:42 -05:00
Jordan Brown
0e037767cd Minor optimization for _GetInverseTypeList (#32155) 
* Minor optimization for _GetInverseTypeList

* We also need to make sure the root component is never instantiated to avoid stack overflows
 2017-10-31 15:11:25 -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
kevinz000
d836803b53 Makes varediting pneumatic cannon easier and makes the code less snowflake-y (#31752) 
* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm

* Update pneumaticCannon.dm
 2017-10-31 09:14:16 -05:00
kevinz000
8a7f8c9bc6 Fixes admin buildmode stripping people naked yet again, adds GetAllContentsIgnoring (#31769) 
* Add GetAllContentsIgnoring which accepts an ignore typecache to ignore

* Update turf.dm

* fixes

* Update unsorted.dm

* Update turf.dm
 2017-10-31 09:09:02 -05:00
LetterJay
31e2303e39 Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849 
[MIRROR] Comms console tweak
 2017-10-31 07:58:15 -04:00
Michiyamenotehifunana
e0a153c4c7 9mm frangibles now requires hacked lathes, costs slightly less 
They are by all means, lethal, even if they absolutely pale in comparison to regular bullets. They'll cost ever so slightly less materials to build.
 2017-10-31 19:47:20 +08:00
Michiyamenotehifunana
f25c1b5cce CRITICAL FIX FOR EXPLODING TOYS 
OH GOD THIS IS SUCH A HILLARIOUS OVERSIGHT
 2017-10-31 19:00:04 +08:00
Michiyamenotehifunana
beb27926b2 Fixes Cit's Toys a little 
Mk.37F no longer needs a permit, Non euplastic blade no longer can turn into dual toyswords
 2017-10-31 18:00:45 +08:00
Michiyamenotehifunana
068976c971 Rebalances citprojectiles somewhat 
Magjectiles have had their speed and range nerfed by about 50%, non lethal 9mms have lower speed and drastically lower range.
 2017-10-31 16:37:09 +08:00
CitadelStationBot
e7179ba02d [MIRROR] Removes force from slappers (#3711) 
* Merge pull request #32153 from tgstation/Cyberboss-patch-4

Removes force from slappers

* Removes force from slappers
 2017-10-31 00:43:48 -07:00
CitadelStationBot
125f81de08 [MIRROR] Use associative list instead of in (#3710) 
* Merge pull request #32128 from Cyberboss/LocateFix

Use associative list instead of `in`

* Use associative list instead of `in`
 2017-10-31 00:43:39 -07: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
60e1b62be8 Merge pull request #3708 from Citadel-Station-13/upstream-merge-32213 
[MIRROR] New ambience for ash storms
 2017-10-31 03:03:37 -04:00