Tad Hardesty
a55d2e7ff7
Show the correct coordinates when a pulse rifle prize is found ( #34089 )
2018-01-05 06:03:05 -06:00
LetterJay
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
LetterJay
c7db4e8310
also syncs a bunch of shit
2017-12-29 04:12:43 -06:00
LetterJay
8a792d6ef6
more save points
2017-12-29 00:07:36 -06:00
oranges
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
oranges
76ccdcb94d
Merge pull request #33770 from vuonojenmustaturska/internalmagfix
...
adds ABSTRACT_1 flag to internal magazine objects
2017-12-27 00:04:59 -06:00
LetterJay
134201d185
Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433
...
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-25 21:26:17 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
oranges
a89435ac33
Merge pull request #32433 from kevinz000/vector_projectiles
...
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
2017-12-21 19:33:42 -06:00
LetterJay
1a5006dc2f
Merge pull request #4473 from Citadel-Station-13/upstream-merge-33672
...
[MIRROR] Fixes bullets making sounds in space and water
2017-12-21 04:55:16 -06:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
ShizCalev
92b018bed7
Fixes bullets making sounds in space and water ( #33672 )
...
* Bullet sounds
* explicit lists
2017-12-21 00:09:08 -06:00
Jordan Brown
b305f1bb26
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
...
Halve gun empty sound level
2017-12-20 00:14:28 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
b46275079e
Update ammo_casings.dm
2017-12-19 15:29:45 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
ShizCalev
1c142356ff
Gun sounds ( #33615 )
2017-12-18 15:15:25 -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
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
ShizCalev
712b86089d
Adds new gun dry firing sounds ( #33503 )
...
* Adds new gun dry firing sounds
* Don't want to hear click when you want to hear bang
2017-12-14 06:15:11 -06:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
kevinz000
d22aee94a1
Fixes nulls ( #33440 )
2017-12-11 11:31:27 -06: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
Jordan Brown
0c93857bc5
Merge pull request #33389 from LuigiBoi/patch-1
...
Fixes spelling error
2017-12-09 15:54:06 -06:00
Jordan Brown
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -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
9c93d8ef4c
fixes ricochets not resetting range
2017-11-28 06:28:47 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
ACCount
8a64287249
Integrated circuit fixes and code improvements
2017-11-21 03:04:17 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Leo
61501988cb
Merge pull request #32871 from AnturK/orbitclean
...
Transfers orbiting ghosts on most common transforms
2017-11-19 17:13:08 -06:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
vuonojenmustaturska
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
oranges
033f336ed1
Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray
...
Xrays go through walls but stop on mobs/blob
2017-11-13 03:17:24 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
nicbn
46c62b6293
overhaul ( #32316 )
2017-11-03 23:40:27 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
LetterJay
3202baec26
Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
...
[MIRROR] Makes staff of change randomly assign a borg module
2017-10-27 02:17:45 -04:00
ShizCalev
6fc3da14d4
Makes staff of change randomly assign a borg module
2017-10-25 23:39:48 -05:00
ShizCalev
7c34440a06
Fixes braindead aliums
2017-10-25 23:32:33 -05:00
Cruix
d48cea337b
Fixed projectile runtimes ( #31973 )
2017-10-21 07:19:28 -05:00
Poojawa
62273a3867
Merge branch 'master' into upstream-merge-31737
2017-10-21 07:18:14 -05:00