shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,879 Commits 5 Branches 0 Tags
aa774aeaeaf97e5dfcbfa58cb5f6664aecdae217
Commit Graph

863 Commits

Author SHA1 Message Date
Tad Hardesty
aa774aeaea Fix MMIs in mechs and firesuits being burned by ash storms (#34349) 2018-01-15 02:58:24 -06:00
Jordan Brown
29a3a196b4 Merge pull request #34409 from MoreRobustThanYou/patch-45 
Fixes monkeymode shit
 2018-01-14 22:02:47 -06:00
Jordan Brown
f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent 
Make traitor panel clearer when toggling completion state
 2018-01-13 23:21:46 -06:00
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310 
[MIRROR] Removes some hrefs from logging
 2018-01-12 17:48:13 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310) 
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
 2018-01-12 07:04:39 -06:00
AnturK
7a4eef12b8 Fixes mind transfers (#34329) 
* Fixes mind transfers

* Don't really see how this is better but sure.
 2018-01-11 15:28:41 -06:00
LetterJay
d6fc0f5d26 Update position_point_vector.dm 2018-01-11 15:20:02 -06:00
LetterJay
92e8f3cefc Merge pull request #4748 from Citadel-Station-13/upstream-merge-34222 
[MIRROR] Fixes error if next_map.json is missing
 2018-01-11 15:14:19 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
AnturK
e381116bbe Fixes beams failing to qdel properly. Maybe. (#34254) 2018-01-11 07:38:55 -06:00
deathride58
e4410a3320 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:11 +00:00
kevinz000
cbe0a9a05d Fixes component forensics deleting old instead of new component. (#34058) 
* component dupe unique

* sorry I was using webeditor on phone and it wouldn't let me tab
 2018-01-07 21:50:23 -06:00
deathride58
85aa297923 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:30:41 +00:00
deathride58
d2ec28b1e6 Merge branch 'master' into mapsyncs43293845982 2018-01-07 20:23:00 +00:00
ShizCalev
7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
LetterJay
f36b07371f Update datum_traitor.dm 2018-01-06 10:23:08 -06:00
AnturK
0638dabfd2 Fixes some antags missing from roundend report 2018-01-06 08:51:51 -06:00
Cruix
e7641dd004 Made the squeek component not make things squeak so often (#34082) 2018-01-05 06:00:08 -06:00
deathride58
e6ec24d13c Merge branch 'master' into mapsyncs43293845982 2018-01-05 02:03:51 +00:00
deathride58
c63661871f Fixes explosion runtimes (#34091) 
* fixes explosion runtimes

* cyka
 2018-01-04 19:52:56 -06:00
deathride58
a8742c5799 fixes swarmer event disable regression, modularizes flyperson-only hulk 2018-01-04 13:00:44 -05:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05:00
deathride58
f39253a0cc Merge pull request #4645 from Citadel-Station-13/upstream-merge-34023 
[MIRROR] Less is more - Nerfs explosion camera shake
 2018-01-03 18:56:17 +00:00
Jordan Brown
3516c837d9 Merge pull request #34023 from deathride58/LESSISMOREHOLYFUCK 
Less is more - Nerfs explosion camera shake
 2018-01-03 11:59:55 -06:00
ShizCalev
c41bf82380 Fixes observers not being transfered to new mobs (#34039) 2018-01-03 07:33:53 -06:00
LetterJay
ae8ae2969c Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601 
[MIRROR] Fixes cross comms
 2018-01-03 04:56:38 -06:00
LetterJay
d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 
[MIRROR] Makes the decal component handle updating inventory icons
 2018-01-02 19:15:46 -06:00
LetterJay
fc4e56201c Merge pull request #4637 from Citadel-Station-13/upstream-merge-33986 
[MIRROR] Makes some virology symptoms more worth using
 2018-01-02 19:15:22 -06:00
LetterJay
3a2deb1d49 Merge branch 'master' into upstream-merge-33601 2018-01-02 18:26:18 -06:00
LetterJay
36cbe323cd Update vision.dm 2018-01-02 15:48:09 -06:00
LetterJay
2720b29908 Update sensory.dm 2018-01-02 15:47:56 -06:00
Emmett Gaines
f581b2d94d Makes the decal component handle updating inventory icons 2018-01-02 15:18:31 -06:00
XDTM
84e0f7b7f3 Makes some virology symptoms more worth using 2018-01-02 15:15:17 -06:00
LetterJay
dcca57808b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/game/gamemodes/blob/overmind.dm
 2018-01-02 14:58:09 -06:00
LetterJay
943388d8f4 Merge pull request #4367 from Citadel-Station-13/upstream-merge-33463 
[MIRROR] Adds blob roundend report.
 2018-01-02 14:56:12 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
7d4a51f659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463 2018-01-01 04:36:29 -06:00
Jordan Brown
d0e5a38c29 Merge pull request #33954 from jammer312/components_fix 
fixes component's dupe
 2017-12-31 09:59:16 -06:00
LetterJay
873e3c7a35 Merge pull request #4615 from Citadel-Station-13/upstream-merge-33570 
[MIRROR] Explosions now cause camera shake based on distance
 2017-12-31 02:53:34 -06:00
Jordan Brown
a57eba6a16 Explosions now cause camera shake based on distance (#33570) 
* Explosions now cause camera shake based on distance

* Explosion close camera shake down to 2.5s

* Explosion camera shake max 100 close intensity, 50 far
 2017-12-31 02:32:41 -06:00
oranges
3208404f14 Merge pull request #33580 from Xhuis/defenses_balancing 
Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
 2017-12-30 16:59:07 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06:00
MoreRobustThanYou
459d4f35c7 Monkeymode fixes (#33796) 
* Monkey fixes

* Update say.dm
 2017-12-29 10:08:17 -06:00
LetterJay
a64a1e4a5c Merge branch 'master' into upstream-merge-33783 2017-12-29 06:49:47 -06:00
LetterJay
b8370a7786 Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882 
[MIRROR] Spell action buttons finally fixed
 2017-12-29 06:25:54 -06:00