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

872 Commits

Author SHA1 Message Date
Jordan Brown
ed9428e29b Merge pull request #34563 from ShizCalev/clean-icon 
Regens icons on clean_act if item is loc'd on a mob
 2018-01-18 17:00:49 -06:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
oranges
b128a28cf3 Merge pull request #34477 from tgstation/Cyberboss-patch-2 
Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-16 14:29:40 -06:00
LetterJay
df1e76aa5f Merge pull request #4873 from Citadel-Station-13/upstream-merge-34484 
[MIRROR] Ash storms are no longer so LOUD inside buildings.
 2018-01-16 13:49:53 -06:00
LetterJay
05989168e7 Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401 
[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
 2018-01-16 13:49:32 -06:00
Jordan Brown
b9e1d44aa4 Merge pull request #34484 from F-OS/patch-8 
Ash storms are no longer so LOUD inside buildings.
 2018-01-16 08:38:42 -06:00
BordListian
1a7341f2c4 Stray bullets and explosions don't blow up the entire syndi lava base anymore (#34401) 
* - Changes explosions to save a reference to the epicenter atom
- Changes syndicate bomb cores to have themselves as the epicenter, removing a redundant get_turf call
- Changes explosive plastitanium walls to only be triggered by bomb core explosions. This is a tad cumbersome but there's only 12 of these walls in the game.

* - Removes debug code

* - Can't hurt
 2018-01-16 08:36:27 -06:00
Jordan Brown
9bd92eddf7 Calling WEAKREF with a /datum/weakref returns the input (#34315) 2018-01-16 08:34:03 -06:00
kevinz000
81bc49cafe Fixes Jaunters 2018-01-15 12:05:46 -06:00
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