shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,005 Commits 5 Branches 0 Tags
edce62494de0b0060328aec6763967ead7b43af1
Commit Graph

97 Commits

Author SHA1 Message Date
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
kevinz000
0aa2e6b6a2 Adds type checks to HUD alert clicks to prevent ghosts from causing runtimes (#31609) 
* Update alert.dm

* better fix
 2017-10-19 02:01:14 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
da2ee4b4b1 Update _defines.dm 2017-10-06 22:20:27 -05:00
ShizCalev
20c5749416 Cleans up leftover Hand of God gamemode references 2017-10-05 18:17:21 -05:00
Leo
951c9d04f2 Merge pull request #31261 from AnturK/lockedslot 
Fixes species locked slots alpha.
 2017-10-04 06:12:46 -05:00
LetterJay
39ef613076 Update screen_objects.dm 2017-10-02 19:37:03 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -05:00
CitadelStationBot
944753dccd [MIRROR] Makes action buttons call the correct procs (#2902) 
* Makes action buttons call the correct procs (#30921)

* Makes action buttons call the correct procs

* Changed to mob/living proc

* CB

* Makes action buttons call the correct procs
 2017-09-22 19:00:34 -05:00
CitadelStationBot
d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBot
4dd0dc9d66 [MIRROR] Various grammar fixes (#2842) 
* Various grammar fixes

* Update mecha_parts.dm

* Update crates.dm

* Update ghost_role_spawners.dm

* Update paper_premade.dm

* Update oldstation.dm
 2017-09-17 22:35:51 -05:00
CitadelStationBot
e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
kingofkosmos
dd27a1850a Adds a message when trying to move while buckled 2017-09-07 10:12:32 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b my eyes hurt 2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040 Merge branch 'master' into upstream-merge-29940 2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) 
* Adds defines for mouse_opacity

* Delete misc.dm.rej

* Update misc.dm
 2017-08-21 20:29:37 -07:00
CitadelStationBot
4961966552 |SPECIES FOOD PREFERENCES| (#2232) 
* Species food preferences

* sync

* Update humans.dm

* FUCK PUBBY
 2017-08-21 20:23:30 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
CitadelStationBot
4686340d3c Fixes help text for embedded objects 2017-08-11 02:47:05 -05:00
CitadelStationBot
d4f15ff6da [MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039) 
* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
 2017-08-03 06:12:27 -07:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
LetterJay
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280 
[MIRROR] Refactor Lung Handling
 2017-07-31 15:37:41 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304 
[MIRROR] Made some object lists less terrible to read
 2017-07-31 03:43:03 -05:00
CitadelStationBot
d7e66b7a3a You can now control-click action buttons to lock them in place 2017-07-24 17:05:41 -05:00
CitadelStationBot
1ebdf19cdb Refactor Lung Handling 2017-07-18 09:59:09 -05:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
deathride58
d21260d480 Makes arousal meter invisible when arousal is disabled (#2028) 
* makes arousal meter invisible when arousal is disabled

* sets the appearance of the arousal meter when the hud is generated

* hm

* hopefully fixed

* cmon

* okay NOW it works. it 100% works
 2017-07-17 22:50:52 -07:00