shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,898 Commits 5 Branches 0 Tags
e292b050f8a413c3f643b20664f2ea3dcf6f4e21
Commit Graph

179 Commits

Author SHA1 Message Date
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
ACCount12
f69e5260e2 Plasma cutter now has a tool sound 2018-01-24 14:00:51 -06:00
Leo
18d193d3ee Merge pull request #34777 from ShizCalev/process-fire 
Corrects invalid process_fire args
 2018-01-24 11:56:22 -06:00
Leo
945358fbfd Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes 
Fixes some kinetic accelerator runtimes
 2018-01-19 19:47:21 -06:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining 
Late joiners also get summoned guns/magic
 2018-01-10 03:11:56 -06:00
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
oranges
1e9598dfbd Clean up a bunch of undefined arg runtimes 2018-01-07 20:53:12 -06:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
Tad Hardesty
a55d2e7ff7 Show the correct coordinates when a pulse rifle prize is found (#34089) 2018-01-05 06:03:05 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05: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
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
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
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
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
ACCount
8a64287249 Integrated circuit fixes and code improvements 2017-11-21 03:04:17 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06: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
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
LetterJay
3c0c5db5d9 Update beam_rifle.dm 2017-10-16 06:14:24 -05:00
kevinz000
ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
kevinz000
b20e5916ea Removes a bunch of sleeps/spawns and makes a few booleans defines 2017-10-14 18:53:48 -05:00