shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,712 Commits 5 Branches 0 Tags
84fe88153ea396ffeff2441af68ee2ecb89d51e7
Commit Graph

697 Commits

Author SHA1 Message Date
LetterJay
bf64a40e8f Merge pull request #4182 from Citadel-Station-13/upstream-merge-33199 
[MIRROR] Prevents the PA from being EMP'd
 2017-12-03 06:12:15 -06:00
FrozenGuy5
65dbabab89 Prevents the PA wires from being EMP'd (#33199) 
* returns emp_act

* jordie for code owner
 2017-12-02 09:43:42 -06:00
Emmett Gaines
b8e754500c Bitflag returns from component signals (#33186) 
* For more useful returns from sendsignal

* removes a needless else/indentation

* cleanup
 2017-12-01 13:09:22 -06:00
Emmett Gaines
9601136df2 sm soundtweak (#33154) 2017-11-30 17:01:29 -06:00
deathride58
6ac2a8c9a0 Merge pull request #4133 from Citadel-Station-13/upstream-merge-32432 
[MIRROR] [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms
 2017-11-30 04:43:51 +00:00
deathride58
4eceef7693 Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967 
[MIRROR] Added bot path data huds
 2017-11-30 04:34:25 +00:00
deathride58
2f42366856 Merge pull request #4158 from Citadel-Station-13/upstream-merge-33109 
[MIRROR] Cancels camera view on teleport
 2017-11-29 03:25:46 +00:00
Jordan Brown
cfb7749903 Merge pull request #33109 from ShizCalev/camera-teleport 
Cancels camera view on teleport
 2017-11-28 06:29:05 -06:00
Cruix
b23c92b056 Added bot path data huds 2017-11-28 06:28:40 -06:00
JJRcop
cd7cbc7f59 Fixes VV Make Space Ninja verb (#32982) 2017-11-28 06:27:45 -06:00
Leo
00f7be5c36 Merge pull request #33072 from AnturK/ibelievedinyoukornowlook 
Fixes non-advanced diseases vaccines.
 2017-11-27 08:25:55 -06:00
deathride58
80d1d03b1d Update weight.dm 2017-11-26 21:32:24 -05:00
deathride58
1d50248da3 Update hulk.dm 2017-11-26 21:29:20 -05:00
deathride58
940f70ff5f Update mutations.dm 2017-11-26 21:28:35 -05:00
Ashe Higgs
6c553d17a4 Splits mutations from mutations.dm into a subfolder, /datums/mutations 2017-11-26 14:54:13 -06:00
deathride58
b6a51532ed Merge pull request #4111 from Citadel-Station-13/upstream-merge-32984 
[MIRROR] Fixes thermite burning lava
 2017-11-26 02:19:15 +00:00
XDTM
7a5af2f237 [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms 2017-11-25 18:54:33 -06:00
MoreRobustThanYou
8f23eeb003 Fix #32755 (#33073) 2017-11-25 15:17:42 -06:00
deathride58
f92bc0c938 Merge pull request #4098 from Citadel-Station-13/upstream-merge-32805 
[MIRROR] Refactor on_reagent_change to pass through the change type
 2017-11-24 23:47:13 +00:00
Leo
e9daba0cd3 Merge pull request #32984 from ninjanomnom/thermite-burns 
Fixes thermite burning lava
 2017-11-24 14:10:26 -06:00
ShizCalev
2762e3b530 Fixes Lord Singuloth hungering for more than he should 2017-11-24 13:00:42 -06:00
oranges
c43591982a Refactor on_reagent_change to pass through the change type 2017-11-24 12:59:09 -06:00
deathride58
eb722bf59f Merge branch 'master' into upstream-merge-33045 2017-11-24 00:10:36 +00:00
Jordan Brown
b2bb942817 Fixes component runtimes 2017-11-23 13:12:38 -06:00
Leo
598f0dc580 Merge pull request #32979 from tgstation/Cyberboss-patch-4 
Adds some sanity checks to component creation
 2017-11-23 05:47:32 -06:00
deathride58
c76cacdf77 Merge pull request #4081 from Citadel-Station-13/upstream-merge-32914 
[MIRROR] [READY]NTnet refactor, assimilates exonet
 2017-11-23 01:40:54 +00: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
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
deathride58
2e9f3bc1c0 Merge pull request #4071 from Citadel-Station-13/upstream-merge-32968 
[MIRROR] Fixes bartender suit having an adjust state
 2017-11-22 20:50:45 +00:00
deathride58
11ecf4d922 Merge pull request #4066 from Citadel-Station-13/upstream-merge-32701 
[MIRROR] Refactor chasm paths to be more sane
 2017-11-22 19:40:55 +00:00
Shadowlight213
06b86e54b3 Adds round ID to status topic (#32976) 2017-11-22 12:41:44 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
Tad Hardesty
38c45fb479 Refactor chasm paths to be more sane (#32701) 
In addition, makes chasm handling a component, so it could be reused for
chasm-likes which are not quite chasms.

Also fixes a couple of bugs relating to building on top of chasms
occasionally erasing the chasm.
 2017-11-22 03:30:49 -06:00
deathride58
1f6b3ce629 Merge branch 'master' into upstream-merge-32188 2017-11-21 19:53:58 +00:00
deathride58
ddbb5c34d4 manual mirrors 2017-11-21 14:06:28 -05:00
deathride58
1dddcb5d83 Update beesease.dm 2017-11-20 22:28:29 -05:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
deathride58
52514c118a Merge pull request #4025 from Citadel-Station-13/upstream-merge-32865 
[MIRROR] Lets you add examine text to component decals
 2017-11-20 05:08:10 +00:00
Jordie
2f8d8b8729 Merge pull request #32865 from ninjanomnom/decal-examine 
Lets you add examine text to component decals
 2017-11-19 22:36:01 -06:00
oranges
808e11b414 Merge pull request #32852 from AutomaticFrenzy/patch/hud-fix 
Fix HUDs being over-added on Login and over-removed by silicons
 2017-11-19 15:16:42 -06:00
deathride58
eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58
9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
 2017-11-18 05:29:32 +00:00
oranges
a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
CitadelStationBot
43f49c74ee [MIRROR] adds 1 gbp to armhulen's account (grammar fix) (#3936) 
* adds 1 gbp to armhulen's account (grammar fix)

* Update mind.dm

* Update mind.dm
 2017-11-17 00:29:40 -08:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
oranges
952fa2a0f2 Fix conflicts between helmet/mech HUDs and HUD glasses 2017-11-16 15:39:15 -06:00
deathride58
0e0eb351b3 Merge pull request #3707 from Citadel-Station-13/upstream-merge-32221 
[MIRROR] Fixes allow_custom_shuttles default
 2017-11-16 17:34:22 +00:00
LetterJay
286442cf4a Merge pull request #3833 from Citadel-Station-13/upstream-merge-32183 
[MIRROR] Ling datum antag standarization.
 2017-11-15 15:00:46 -06:00
LetterJay
9849b9a13b Merge pull request #3912 from Citadel-Station-13/upstream-merge-32482 
[MIRROR] Improves the deep fryer
 2017-11-15 11:13:56 -06:00