shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,778 Commits 5 Branches 0 Tags
134201d185d4f18fa66fffca1c8a786fe99dfd7e
Commit Graph

792 Commits

Author SHA1 Message Date
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
LetterJay
06354b97d9 Merge pull request #4517 from Citadel-Station-13/upstream-merge-33792 
[MIRROR] gbs now grants a sense of pride and accomplishment instead of 40 hours of toxin damage.
 2017-12-24 17:00:30 -06:00
LetterJay
0f86dd3f72 Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306 
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-24 17:00:06 -06:00
Armhulen
d9f3c74607 pride and satisfaction 2017-12-24 15:03:07 -06:00
Jordan Brown
af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -06:00
Jordan Brown
f20622cc54 Adds round ID to Show Server Revision (#33723) 2017-12-22 10:43:37 -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
8750d93126 Merge branch 'master' into upstream-merge-33614 2017-12-21 05:02:21 -06:00
LetterJay
74232f6373 Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550 
[MIRROR] Adds instanceless component dupe mode
 2017-12-21 04:58:20 -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
Jordan Brown
09c802f984 Merge pull request #33550 from ninjanomnom/instanceless-component-dupe 
Adds instanceless component dupe mode
 2017-12-21 00:51:02 -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
deathride58
0be7ea0755 Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599 
[MIRROR] Callback security and usr
 2017-12-21 03:29:13 +00:00
deathride58
2de3b12364 Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594 
[MIRROR] Adds knock off component
 2017-12-21 03:25:41 +00:00
LetterJay
00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJay
92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
LetterJay
5f69eac050 Update mind.dm 2017-12-20 00:19:39 -06:00
Jordan Brown
25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
LetterJay
d6a5ee596b Update mind.dm 2017-12-19 23:55:36 -06:00
LetterJay
7dec65ff85 fuck 2017-12-19 20:20:09 -06:00
LetterJay
36ad355f9d Update mind.dm 2017-12-19 20:08:49 -06:00
LetterJay
a8e36670e2 Update mind.dm 2017-12-19 20:02:03 -06:00
LetterJay
614e93b975 Update mind.dm 2017-12-19 19:26:28 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Jordan Brown
fabfad270f Callback security and usr (#33599) 
* Gonna regret writing this one day

* tmp -> temp

* Make PushUsr() a /world proc

* Callbacks now preserve usr

* Fixes PushUsr return value

* Fixes PushUsr invocations

* Update modifyvariables.dm

* Use weakrefs in callback user

* Further fixes

* Whoopsie
 2017-12-18 21:41:33 -06:00
kevinz000
8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTM
6b4099805f [Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209) 
* Adds abductor Mind Interface Devices, and a gland HUD

* .
 2017-12-18 20:29:37 -06:00
LetterJay
b1669b8179 Update severe.dm 2017-12-18 17:24:16 -06:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJay
ed91ccdeff Update decal.dm 2017-12-18 15:14:55 -06:00
Emmett Gaines
e026115045 Decal rotation fix 2017-12-17 20:49:51 -06:00
Leo
2578484644 Merge pull request #33613 from Armhulen/patch-32 
deep fryers are quieter now...
 2017-12-17 20:22:00 -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
Jordan Brown
7f997a6a6d Adds feedback for explosions (#33511) 
* Adds feedback for explosions

* Remove stray quote

* Fixes + flash and flame
 2017-12-14 14:00:51 -06:00
Leo
d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
Jordan Brown
5709d44968 Merge pull request #33487 from deathride58/fixesgenetics 
Fixes genetics mutations disappearing
 2017-12-13 09:14:09 -06:00
Leo
2221d854a1 Merge pull request #33446 from tgstation/Cyberboss-patch-3 
INVOKE_ASYNC is the exception not the rule!
 2017-12-11 20:39:38 -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
AnturK
6bfca33a78 Roundend report refactor 2017-12-11 10:58:23 -06:00
deathride58
6e6b85c01a Merge pull request #4311 from Citadel-Station-13/upstream-merge-33276 
[MIRROR] Restores the uplink modules, removes LoadComponents
 2017-12-10 23:49:25 +00: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
7179547be4 Merge branch 'master' into upstream-merge-31727 2017-12-10 21:51:51 +00:00
LetterJay
d82698d106 Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280 
[MIRROR] Add caltrop component for spikey floor objects
 2017-12-10 14:20:40 -06:00
LetterJay
de13c6c799 Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395 
[MIRROR] switches lobes for grammar n shit
 2017-12-10 14:20:02 -06:00
LetterJay
563517ab4a Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378 
[MIRROR] Makes godwoken syndrome a bit more reliable
 2017-12-10 14:19:51 -06:00
oranges
d88bff9fa9 Restores the uplink modules, removes LoadComponents 2017-12-10 14:14:37 -06:00