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
d2ec28b1e6
Merge branch 'master' into mapsyncs43293845982
2018-01-07 20:23:00 +00:00
deathride58
bd160e46d9
Update adjacent.dm
2018-01-05 17:25:41 -05:00
Jordan Brown
5c64e25288
[512] Disallow cross-Z examination and manipulation
2018-01-05 09:25:54 -06:00
deathride58
af96f58ffd
syncs defines
2018-01-03 23:15:49 -05:00
LetterJay
c8f3fdfe38
Merge branch 'master' into upstream-merge-33663
2017-12-30 13:29:36 -06:00
LetterJay
6f8c2c1daf
Update item_attack.dm
2017-12-29 18:40:58 -06:00
LetterJay
a64a1e4a5c
Merge branch 'master' into upstream-merge-33783
2017-12-29 06:49:47 -06:00
XDTM
d8943d6a1e
[Ready]Adds the Pax reagent, small tweaks to pacifism
2017-12-29 02:37:58 -06:00
YPOQ
6fac704a4f
Fixes AI eyes getting nullspaced when jumping to deleted cameras ( #33856 )
2017-12-29 00:28:47 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -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
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
LetterJay
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00: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
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -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
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06: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
deathride58
216b0931d1
Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935
...
[MIRROR] Clockwork Cult Defenses Patch - Leader role, traps and wiring, hulk and mech soft-counters, +more
2017-12-10 22:43:58 +00:00
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
oranges
30143ee601
Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
...
[READY]Fixes beam rifles and flightsuits
2017-12-10 15:19:18 -06: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
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -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
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
Emmett Gaines
b8e754500c
Bitflag returns from component signals ( #33186 )
...
* For more useful returns from sendsignal
* removes a needless else/indentation
* cleanup
2017-12-01 13:09:22 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -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
LetterJay
286442cf4a
Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183
...
[MIRROR] Ling datum antag standarization.
2017-11-15 15:00:46 -06:00
LetterJay
1939e96bb6
Merge branch 'master' into upstream-merge-32183
2017-11-15 10:22:40 -06:00
AnturK
13ebff97df
Fixes AI door hotkeys & other weirdness
2017-11-15 02:03:17 -06:00
kevinz000
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
LetterJay
14944d8711
Merge branch 'master' into upstream-merge-32183
2017-11-12 23:09:55 -06:00
