shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,549 Commits 5 Branches 0 Tags
e07efc29fb7b18cd48ee379a3f2bbfa35778b686
Commit Graph

132 Commits

Author SHA1 Message Date
Poojawa
86b11050b6 Citadel's folder's end (#5828) 
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
 2018-03-06 17:40:48 -06:00
CitadelStationBot
30a4705c01 [MIRROR] Clean up all sorts of crap, mostly defines (#5788) 
* Clean up all sorts of crap, mostly defines

* fixes compile errors
 2018-03-05 13:23:28 -06:00
LetterJay
863585f477 Merge pull request #5753 from Citadel-Station-13/upstream-merge-35440 
[MIRROR] Adds minor roundstart traits! (ala CDDA, etc.)
 2018-03-02 23:37:41 -06:00
CitadelStationBot
8543df055d [MIRROR] Add parallax sprites from RIS (#5749) 
* Add parallax sprites from RIS (#36049)

* Add files via upload

* Update parallax.dm

* Add parallax sprites from RIS
 2018-03-02 18:35:35 -06:00
Ashe Higgs
0a449af83e Adds minor roundstart traits! (ala CDDA, etc.) 2018-03-02 14:38:18 -06:00
CitadelStationBot
0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724) 
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
 2018-02-27 05:04:00 -06:00
deathride58
a3180b0173 Merge pull request #5506 from Citadel-Station-13/upstream-merge-35431 
[MIRROR] html_interface removal and crew monitoring console refactor.
 2018-02-16 14:27:26 +00:00
AnturK
35b8e410be html_interface removal and crew monitoring console refactor. 2018-02-15 14:31:27 -06:00
Jordan Brown
7b493c30d7 Merge pull request #35664 from AnturK/tooltipruntimes 
Fixes some tooltip runtimes
 2018-02-15 10:38:27 -06:00
Slignerd
afcdb771b3 Squashes silicon HUDs together (#35212) 
* Squashes silicon sensors together

* Fixes proc names

* Brings back individual sec/med huds for pai usage

* This fixes the pai

* Fixes toggle text
 2018-02-07 02:32:14 -06:00
deathride58
09436512b4 Merge branch 'master' into TG-sync-testing 2018-02-03 01:52:44 +00:00
CitadelStationBot
f02529555c [MIRROR] Fix roundend splash screens (#5242) 
* Fix roundend splash screens

* Update screen_objects.dm
 2018-02-02 01:22:56 -06:00
Poojawa
fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -06:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606 
[MIRROR] Config dir again except this time it works
 2018-01-21 22:41:13 +00:00
LetterJay
923b72e138 Update ghost.dm 2018-01-21 14:19:48 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
Jordan Brown
c36b095146 Fixes ghost show_hud runtime 2018-01-21 09:14:50 -06:00
deathride58
cf538efeb7 Update credits.dm 2018-01-19 08:47:27 -05:00
Leo
a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
Tad Hardesty
06120d3174 Grammarize the internals screen object 2018-01-13 04:36:43 -06:00
deathride58
af96f58ffd syncs defines 2018-01-03 23:15:49 -05:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
YPOQ
6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
LetterJay
14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485 
[MIRROR] code improvements from mso and co
 2017-12-26 07:38:17 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Armhulen
55ee64940f code improvements from mso and co 2017-12-18 20:50:07 -06:00
LetterJay
d384941d5c Update robot.dm 2017-12-17 15:56:44 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150 
[MIRROR] Makes actionbuttons remember positions where you locked them.
 2017-12-10 23:04:34 +00:00
jammer312
c55b914f06 Makes actionbuttons remember positions where you locked them. 2017-12-08 10:33:54 -06:00
Ashe Higgs
0ae0c44991 Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more 2017-12-06 16:37:15 -06:00
deathride58
c56003f6ff Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950) 
* adds support for non-1:1 screen ratios for fullscreen overlays

* prevents future copypasta, adds widescreen support to clickcatchers

* oops, makes it actually compile

* HOPEFULLY makes it actually compile, makes projectiles and mouse_angle_from_client support widescreen

* i need shittier shitcode

* !!!HOPEFULLY!!! fixes the screen fuckery

* Fixes compiling errors. Tested locally, it seems like it works

* fixes runtime in mouse_angle_from_client

* Fixes non-1:1 TGUI runtimes for borgs and ghosts

* adds actual defines for fullscreen overlay resolution

* makes varediting view call change_view to make clickcatcher regenerate proper

* testmerge toggle widescreen verb and fixes vving view

* FUCK - fixes test verb to properly use change_view, so clickcatchers regenerate and such

* fixes parallax runtimes - how'd i miss this

* removes debug verb
 2017-12-05 19:46:20 -06:00
deathride58
ac4ca767d0 Merge pull request #3987 from deathride58/manualmirror1 
Manual mirror of https://github.com/tgstation/tgstation/pull/32496
 2017-11-19 07:47:33 +00:00
deathride58
794bfb18c1 Manual mirror of https://github.com/tgstation/tgstation/pull/32496 2017-11-17 09:49:26 -05:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
MoreRobustThanYou
ecf49cd0a0 ok now i kinda tested the ark examine (#32445) 
* No, I did NOT test the Ark examine.

* Update countdown.dm

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm

* OK JOAN FIXED

* Update ark_of_the_clockwork_justicar.dm
 2017-11-09 20:57:39 -06:00
LetterJay
a9d8bf1c7a Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379 
[MIRROR] Scale fullscreen overlays to the view size
 2017-11-09 03:24:57 -06:00
LetterJay
5dcad7c40a Update fullscreen.dm 2017-11-07 04:38:56 -06:00
LetterJay
4a8978a74d Update fullscreen.dm 2017-11-07 03:25:28 -06:00
LetterJay
6a1c0f6683 Update screen_objects.dm 2017-11-07 03:24:40 -06:00
Tad Hardesty
a0801a8e92 Scale fullscreen overlays to the view size 2017-11-05 04:52:40 -06:00
Jordan Brown
a4665bc7cd Fixed required images being in the config folder 2017-11-03 23:35:06 -05:00
vuonojenmustaturska
53c9c16fe3 one more thing to allow more mobs to qdel nicely (#32168) 2017-10-29 07:14:44 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -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