cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-02-04 05:08:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,151 Commits 55 Branches 0 Tags
32fb136bf00a970f8b1bed31182e5202a4e0b330
Commit Graph

423 Commits

Author SHA1 Message Date
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
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
Jordan Brown
3d50fec086 Merge pull request #31714 from DaxDupont/screaminginternally 
Fixes "permenant" and "permenantly" typos in code/comments.
 2017-10-15 11:32:13 -05:00
kevinz000
e8bb77ba2c Merge pull request #3387 2017-10-14 13:35:04 -07:00
Jordan Brown
ccb0674988 Fixes the last Href Token issues (#31666) 2017-10-14 11:46:01 -05:00
Leo
506324fbec Merge pull request #31670 from tgstation/Cyberboss-patch-3 
IC Issue also tells the ahelper that their ticket has been resolved
 2017-10-14 09:07:03 -05:00
Armhulen
49d5d08456 Adds a fireball from the heavens as an admin smite (#31502) 
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
 2017-10-12 20:37:58 -05:00
LetterJay
f93733576e Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528 
[MIRROR] Minor refactor of how gas IDs are handled
 2017-10-12 07:19:30 -04:00
LetterJay
fe00337475 Merge pull request #3313 from Citadel-Station-13/upstream-merge-31545 
[MIRROR] Adds round ID to the banning panel
 2017-10-12 07:17:34 -04:00
LetterJay
9af6ffa946 Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543 
[MIRROR] Datumizes world/Topic
 2017-10-12 07:16:44 -04:00
LetterJay
e15c337851 Merge pull request #3306 from Citadel-Station-13/upstream-merge-31449 
[MIRROR] Datum antag wizard.
 2017-10-12 07:15:53 -04:00
LetterJay
6ed7f455b7 Update modifyvariables.dm 2017-10-12 02:54:26 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Jordan Brown
976797afb3 Adds round id to the banning panel (#31545) 2017-10-12 00:28:44 -05:00
Jordan Brown
1604f8b1d3 Datumizes world/Topic (#31543) 
* Datumizes world/Topic

* active_players requires comms_key
 2017-10-12 00:28:27 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
Kyle Spier-Swenson
4c10fe270f Fixes VVing associated values in lists when the value was a number. 2017-10-10 22:17:56 -05:00
kevinz000
7f08bf08e3 Adds walk and step SDQL2 wrappers (#31447) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-10-10 03:18:43 -05:00
Leo
afec2b7abc Merge pull request #31463 from AnturK/nobodycanknowofmymistakes 
Stops check antags message if round has not started yet.
 2017-10-09 16:02:37 -05:00
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
ExcessiveUseOfCobblestone
f2102c68f1 Resolving tickets now informs the player. (#31357) 
* Update adminhelp.dm

* Update adminhelp.dm
 2017-10-06 21:25:53 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup 
Cleans up and fixes old landmarks
 2017-10-05 03:05:40 -05:00
LetterJay
3c0a9c23e1 Merge pull request #3081 from Citadel-Station-13/upstream-merge-31196 
[MIRROR] Fixes check antagonists for blood brothers
 2017-10-02 21:12:40 -04:00
LetterJay
9026f029d5 Merge pull request #3079 from Citadel-Station-13/upstream-merge-31103 
[MIRROR] Refactor quick create antag panel code, fixed AFK revs not properly ending the round.
 2017-10-02 21:12:31 -04:00
LetterJay
4d68cd0803 Merge pull request #3078 from Citadel-Station-13/upstream-merge-31191 
[MIRROR] Makes the reply link for ahelps use the global token
 2017-10-02 21:12:17 -04:00
oranges
139ebadc52 Merge pull request #31196 from kevinz000/patch-303 
Fixes check antagonists for blood brothers
 2017-10-02 15:52:10 -05:00
ShizCalev
e402c4350c Refactor quick create antag panel code, fixed AFK revs not properly ending the round. (#31103) 
* Refactor quick create antag, fixed AFK revs not ending

* More cleanup

* Simplified one of the checks
The other half was covered by considered_alive already.

* Reordered check

Eliminate current antags sooner before running them through the rest of
the checks.

* removed switch
 2017-10-02 02:48:51 -05:00