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

448 Commits

Author SHA1 Message Date
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947 
[MIRROR] Pirate ship event
 2017-11-13 11:52:40 -06:00
oranges
43113cd9b5 Merge pull request #31947 from AnturK/yarr 
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.

If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.

    There's an internal GPS onboard so crew will always be able to follow the shuttle.
    Crew of 3, moderately armed. (Balance pending)
    Shuttle engines have 3 minute cooldown between jumps.
    Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
 2017-11-13 03:19:38 -06:00
LetterJay
9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay
439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJay
d8c25f656b Update admin_investigate.dm 2017-11-12 08:56:53 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay
460f19297f Merge pull request #3751 from Citadel-Station-13/upstream-merge-32292 
[MIRROR] animate sqdl wrapper works now.
 2017-11-09 03:20:01 -06:00
Leo
6915acfcd1 Editing a variable now logs the old value (#32478) 
* Editing a variable now logs the old value

* Moves the html_encode to log_admin
 2017-11-07 14:25:02 -06:00
Jordan Brown
0bb150ff98 Revert "Adds 'round' chat command" (#32421) 2017-11-05 15:37:50 -06:00
LetterJay
74706b1eea Merge pull request #3791 from Citadel-Station-13/upstream-merge-32367 
[MIRROR] Adds 'round' chat command
 2017-11-04 22:47:48 -05:00
LetterJay
03a0057609 Merge pull request #3785 from Citadel-Station-13/upstream-merge-32384 
[MIRROR] Hopefully fixes guest accounts being able to log in
 2017-11-04 22:45:00 -05:00
LetterJay
113e3a5b53 Merge pull request #3783 from Citadel-Station-13/upstream-merge-32358 
[MIRROR] Dullahan Fixes
 2017-11-04 22:44:23 -05:00
Leo
1db88cecb2 Merge pull request #32367 from tgstation/Cyberboss-patch-3 
Adds 'round' chat command
 2017-11-03 17:36:09 -05:00
Jordan Brown
b3bf2276ff Merge pull request #32384 from McBawbaggings/tgfix 
Hopefully fixes guest accounts being able to log in
 2017-11-03 15:54:36 -05:00
KorPhaeron
8f1d81f816 Dullahan Fixes (#32358) 
* Dullahan

* Fixes cyborg issue

* Fixes hearing issues
 2017-11-03 15:54:19 -05:00
Leo
ada8ad0ead Proper and improper macros are removed before sending to irc (#32347) 
* Proper and improper macros are removed before sending to irc

* Removes leftover check
 2017-11-03 15:53:26 -05:00
LetterJay
4af81f0a3a Merge pull request #3750 from Citadel-Station-13/upstream-merge-32289 
[MIRROR] Fix quick-create nuke team
 2017-11-02 04:17:46 -05:00
LetterJay
196fb5f345 Update SDQL_2_wrappers.dm 2017-11-02 02:22:32 -05:00
Leo
24eece99a5 animate sqdl wrapper works now. 2017-11-01 21:38:35 -05:00
Leo
a9ef812497 Merge pull request #32289 from AutomaticFrenzy/patch/nukies 
Fix quick-create nuke team
 2017-11-01 21:38:29 -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
oranges
c5e11eceed Some minor contamination fixes 2017-10-31 15:30:53 -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
LetterJay
254ffca3b7 Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162 
[MIRROR] Actually fixes meteors, again
 2017-10-29 15:49:40 -04:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116 
[MIRROR] Line by line profiling system
 2017-10-29 15:48:47 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
vuonojenmustaturska
d6d01ab630 Actually fixes meteors, again (#32162) 
* Actually fixes meteors, again

* unrelated typo fix for an admin debug verb
 2017-10-29 07:13:31 -05:00
LetterJay
41eb83fb3d Merge pull request #3658 from Citadel-Station-13/upstream-merge-32127 
[MIRROR] [s] Blocks world proc calls
 2017-10-29 03:47:43 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
5f9a76c6dd Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009 
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
 2017-10-29 03:45:06 -04:00
oranges
c00c1dcc00 Merge pull request #32127 from tgstation/Cyberboss-patch-3 
[s] Blocks world proc calls
 2017-10-27 17:35:20 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
JamieH
7811507f1a Add a safety check to buildmode, also fix a bug with corner selection (#32009) 
* Update buildmode.dm

* Add files via upload

* Update buildmode.dm

* Update buildmode.dm
 2017-10-27 04:51:58 -05:00
deathride58
55cad46845 Adds a button to let people ahelping know their issue is being handled 2017-10-26 12:21:28 -04:00
Jordan Brown
6199191dd8 Merge pull request #32007 from lzimann/poll 
Selecting multiple choice polls with 1 choice now become a single option poll
 2017-10-23 19:37:05 -05:00
LetterJay
4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978 
[MIRROR] Cleans up datum traitor minimally.
 2017-10-23 14:50:05 -04:00
LetterJay
58ef2f1872 Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922 
[MIRROR] Adds admin override for false alarm event.
 2017-10-23 03:44:25 -04:00
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
AnturK
0faee43f95 Cleans up datum traitor minimally. (#31978) 
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.

* Not needed anymore
 2017-10-22 17:44:55 -05:00
LetterJay
5337b1fed2 Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780 
[MIRROR] Disentangles blob from blob mode/removes blob mode
 2017-10-22 16:39:35 -04:00
LetterJay
529eaa6aca Update player_panel.dm 2017-10-22 10:51:11 -05:00
Jordan Brown
faf0e0a10a Adds admin override for false alarm event. 2017-10-22 00:05:23 -05:00
KorPhaeron
c42e1b17f4 Blob fixes 2017-10-21 14:08:10 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBot
c0e00ab5ca [MIRROR] [s] Fixes datum antag is_banned (#3523) 
* Fixes datum antag jobbans (#31901)

* [s] Fixes datum antag is_banned
 2017-10-20 12:48:15 -05:00
KorPhaeron
20b17eceec Disentangles blob from blob mode/removes blob mode 2017-10-18 20:55:42 -05:00
AnturK
2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
Leo
3857bfb2fc Merge pull request #31768 from AnturK/ahelptrim 
Trims ahelps
 2017-10-16 16:48:04 -05:00