cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-25 09:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,324 Commits 55 Branches 0 Tags
db6f0727d2788f1232fe77942f7fa9eb66aa1b51
Commit Graph

357 Commits

Author SHA1 Message Date
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
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
2dfbdaff30 [MIRROR] fixes being unable to hit people next to you if you're dragging them and moving (#3517) 
* Update projectile.dm (#31893)

* fixes being unable to hit people next to you if you're dragging them and moving
 2017-10-21 06:15:37 -05:00
CitadelStationBot
5abe26c765 [MIRROR] fixes gibtonite instant hitting , projectile double hitting - not entirely my fault (#3526) 
* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault (#31891)

* Update projectile.dm

* Update projectile.dm

* Update projectile.dm

* fixes gibtonite instant hitting , projectile double hitting - not entirely my fault
 2017-10-21 06:11:28 -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
LetterJay
92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04: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
Leo
a9389f4099 Merge pull request #31800 from DaxDupont/500hours 
Fixes automatic fire on guns
 2017-10-17 09:19:42 -05:00
kevinz000
87b84cedf0 Fixes vehicles granting projectile immunity and YET AGAIN reworks projectile targetting priorities (#31660) 
* Update projectile.dm

* fixes projectiles
 2017-10-17 03:51:10 -05:00
LetterJay
3c0c5db5d9 Update beam_rifle.dm 2017-10-16 06:14:24 -05:00
LetterJay
ee70d961d7 Update firing.dm 2017-10-16 06:13:51 -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
LetterJay
45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
nicbn
921b65ced0 Bullet decals tweak (#31420) 
* wee

* screen clock update

* resist and stop pulling

* Whoop, Joan messed up on the selection border so here's some fixed icons for that

* there we go

* Update walls.dm

* Update walls.dm

* Update walls.dm
 2017-10-13 09:47:10 -05:00