shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,868 Commits 5 Branches 0 Tags
ad3b59c247d48814b8200bef17d2dd758f72bbca
Commit Graph

4847 Commits

Author SHA1 Message Date
LetterJay
ad3b59c247 Merge pull request #3281 from Citadel-Station-13/upstream-merge-31498 
[MIRROR] Fixes emote runtimes
 2017-10-10 22:28:14 -04:00
AnturK
e880545425 Fixes emote runtimes (#31498) 
* Emote runtime

* Bleh didn't add all
 2017-10-10 08:42:30 -05:00
Leo
ed3a031543 Merge pull request #31497 from AnturK/cyberboss-pls 
Fixes some tempremoves
 2017-10-10 07:10:35 -05:00
LetterJay
9d7877cd02 Merge pull request #3277 from Citadel-Station-13/upstream-merge-31012 
[MIRROR] Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities.
 2017-10-10 05:56:18 -04:00
LetterJay
5c88efd838 Merge pull request #3276 from Citadel-Station-13/upstream-merge-31482 
[MIRROR] Removes a spawn from revolution gamemode code
 2017-10-10 05:55:56 -04:00
LetterJay
f53d0844fc Merge pull request #3275 from Citadel-Station-13/upstream-merge-31483 
[MIRROR] Removes a spawn from nukeop gamemode code
 2017-10-10 05:55:48 -04:00
LetterJay
b7c65c7482 Merge pull request #3274 from Citadel-Station-13/upstream-merge-31492 
[MIRROR] Fixes xeno mass confusion
 2017-10-10 05:55:38 -04:00
LetterJay
f0fc11f5b5 Merge pull request #3273 from Citadel-Station-13/upstream-merge-31493 
[MIRROR] Fixes closet layer
 2017-10-10 05:55:28 -04:00
LetterJay
c24a212f0e Merge pull request #3272 from Citadel-Station-13/upstream-merge-31447 
[MIRROR] Adds walk and step SDQL2 wrappers
 2017-10-10 05:55:17 -04:00
LetterJay
8b16fc54d6 Merge pull request #3271 from Citadel-Station-13/upstream-merge-31440 
[MIRROR] Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever
 2017-10-10 05:55:03 -04:00
LetterJay
a1d4868601 Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437 
[MIRROR] Makes the santa event properly poll ghosts
 2017-10-10 05:54:44 -04:00
LetterJay
c3533fee76 Merge pull request #3269 from Citadel-Station-13/upstream-merge-31408 
[MIRROR] Makes cameras work on shuttles
 2017-10-10 05:54:33 -04:00
LetterJay
0331110388 Merge pull request #3268 from Citadel-Station-13/upstream-merge-31416 
[MIRROR] Clockwork Golems will not slip on glass
 2017-10-10 05:54:18 -04:00
LetterJay
26800c1d1d Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399 
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
 2017-10-10 05:54:08 -04:00
LetterJay
b0c833059e Update chunk.dm 2017-10-10 04:40:26 -05:00
GLACoding
9050cc63ca Syndicate turrets (and other machines in walls) can now be hit by projectiles. Also reworks target priorities. (#31012) 
* Projectile code additions

* Adds !prehit checks and corrects the check for energy cannon spam

* Adds checks for machines and structures to stop double hitting

* JJRcop Requesting Fixes #1

* JJRcop Requested Fixes #2

* Fixes projectiles unable to hit mobs in machines

* Adds in a new proc select_target, and rewrites some bits

Fixes projectiles double hitting when targetting machines with mobs on them, also makes it so weapons with forcedodge can hit targets inside walls.

* AnturK requested fix #1
 2017-10-10 03:28:33 -05:00
oranges
260ec3364b Merge pull request #31482 from kevinz000/patch-328 
Removes a spawn from revolution gamemode code
 2017-10-10 03:23:20 -05:00
oranges
1843738e7c Merge pull request #31483 from kevinz000/patch-329 
Removes a spawn from nukeop gamemode code
 2017-10-10 03:23:14 -05:00
oranges
429543f4ae Merge pull request #31492 from ShizCalev/sometimes-i-drink-a-glass-of-water-just-to-suprise-my-liver 
Fixes xeno mass confusion
 2017-10-10 03:22:03 -05:00
AnturK
344238a401 Fixes closet layer (#31493) 
* Fixes closet layer

* Actually this might be better.
 2017-10-10 03:20:53 -05:00
kevinz000
7f08bf08e3 Adds walk and step SDQL2 wrappers (#31447) 
* Update SDQL_2_wrappers.dm

* Update SDQL_2_wrappers.dm
 2017-10-10 03:18:43 -05:00
oranges
472e68be9c Merge pull request #31440 from kevinz000/patch-319 
Fixes runtime with lavaland_equipment_pressure_check if air isn't initialized on a turf or whatever
 2017-10-10 03:17:33 -05:00
MoreRobustThanYou
b05a4ebb29 Makes the santa event properly poll ghosts (#31437) 
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
 2017-10-10 03:16:23 -05:00
oranges
494bb0222c Makes cameras work on shuttles 2017-10-10 03:15:13 -05:00
oranges
5d3a805d30 Merge pull request #31416 from Armhulen/patch-2 
Clockwork Golems will not slip on glass
 2017-10-10 03:14:01 -05:00
kevinz000
a6ac800db0 Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser (#31399) 
* precision

* precision

* sanity checks

* itt kevinz doesn't know how cyberboss procs work

* fixes

* allows user cancellation

* im dumb

* itt: im still dumb

* fixes stuff, makes it set on init

* refactors reagentgrinder code

* more fixes, prevents melee attacks from going anyways

* ...? wtf is with usetopic

* Finally found out what's wrongw ith this thing.

* fixes a mistake
 2017-10-10 03:11:50 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
LetterJay
295c509236 Merge pull request #3264 from Kevak/Shockcollarpocketfix 
Fixes Shock Collars Getting Stuck In Pockets.
 2017-10-10 02:46:45 -04:00
LetterJay
e0f9167153 Merge pull request #3248 from Citadel-Station-13/upstream-merge-31066 
[MIRROR] Refactors virus spreading
 2017-10-10 02:46:04 -04:00
Kevak
fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
LetterJay
9aca1d6cf6 Merge pull request #3261 from Citadel-Station-13/upstream-merge-31446 
[MIRROR] Boolean defines in mech construction datums, clears out some dels
 2017-10-10 01:06:12 -04:00
LetterJay
7edd104159 Merge pull request #3260 from Citadel-Station-13/upstream-merge-31439 
[MIRROR] Fixes invalid arg runtime with drop_if_replaced
 2017-10-10 01:05:59 -04:00
LetterJay
ad69aa5b8d Merge pull request #3259 from Citadel-Station-13/upstream-merge-31465 
[MIRROR] Removes a spawn from traitor code
 2017-10-10 01:05:47 -04:00
LetterJay
e6fad0965d Merge pull request #3258 from Citadel-Station-13/upstream-merge-31451 
[MIRROR] Update server tools API to 3.1.0.2
 2017-10-10 01:05:35 -04:00
LetterJay
94d36578e1 Merge pull request #3257 from Citadel-Station-13/upstream-merge-31468 
[MIRROR] Gets rid of spawns in buttons
 2017-10-10 01:05:21 -04:00
LetterJay
e232520705 Merge pull request #3256 from Citadel-Station-13/upstream-merge-31469 
[MIRROR] Fixes Teslas always doing the same movement pattern
 2017-10-10 01:05:03 -04:00
LetterJay
634633c691 Merge pull request #3255 from Citadel-Station-13/upstream-merge-31466 
[MIRROR] Makes config loading messages consistent
 2017-10-10 01:04:42 -04:00
LetterJay
b969bb7eec Update data_huds.dm 2017-10-10 00:04:20 -05:00
LetterJay
803434f3a3 Merge pull request #3240 from deathride58/furryhippie 
Cherrypicks several Boxstation changes from old Hippie (+ other small tweaks)
 2017-10-09 23:02:31 -04:00
LetterJay
11abb49d12 Merge pull request #3254 from Citadel-Station-13/upstream-merge-31463 
[MIRROR] Stops check antags message if round has not started yet.
 2017-10-09 23:02:06 -04:00
LetterJay
8c0ecb3c5c Merge pull request #3253 from Citadel-Station-13/upstream-merge-31470 
[MIRROR] Uses the proper list for xeno landmarks/nightmare spawning
 2017-10-09 23:01:59 -04:00
LetterJay
95031ae187 Merge pull request #3252 from Citadel-Station-13/upstream-merge-31441 
[MIRROR] Fixes a forceMove(null)
 2017-10-09 23:01:51 -04:00
LetterJay
5d219d691d Merge pull request #3251 from Citadel-Station-13/upstream-merge-31448 
[MIRROR] Fixes 9mm ammo appearing in traitortot surplus crates
 2017-10-09 23:01:43 -04:00
LetterJay
261df4f136 Merge pull request #3250 from Citadel-Station-13/upstream-merge-31387 
[MIRROR] Adds a hacked autolathe subtype
 2017-10-09 23:01:35 -04:00
LetterJay
3ee08632d2 Update traitor.dm 2017-10-09 21:37:24 -05:00
LetterJay
3232f0a2a0 Update flightsuit.dm 2017-10-09 21:27:59 -05:00
LetterJay
e8d09d796a Update data_huds.dm 2017-10-09 21:27:36 -05:00
LetterJay
8596fa93e4 Update transformation.dm 2017-10-09 21:27:12 -05:00
LetterJay
fc1b2c4e75 Update rhumba_beat.dm 2017-10-09 21:26:46 -05:00
LetterJay
2d3b4225d9 Update retrovirus.dm 2017-10-09 21:26:33 -05:00