shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,443 Commits 5 Branches 0 Tags
2b0bb76b9e40ab518b10bd5e682206d70b835ca4
Commit Graph

6407 Commits

Author SHA1 Message Date
deathride58
2b0bb76b9e Merge pull request #4112 from Citadel-Station-13/upstream-merge-32985 
[MIRROR] Fixes AIs being unable to interact with unscrewed airlocks
 2017-11-24 22:57:26 +00:00
Armhulen
a12a12b550 comma splice and ellipsis grammar fix (#33040) 
* :*)

* i think this fixes splice
 2017-11-24 15:21:11 -06:00
Leo
541b8db684 Merge pull request #32985 from YPOQ/airlockfix 
Fixes AIs being unable to interact with unscrewed airlocks
 2017-11-24 14:11:39 -06:00
deathride58
d5d89a57b4 Update stock_parts.dm 2017-11-23 23:50:25 -05:00
ACCount
2147c60b7f Replaces "console screen" stock part with glass sheets 2017-11-23 18:53:47 -06:00
kevinz000
399c2ebfcc Update _compile_options.dm 2017-11-23 16:37:49 -08:00
deathride58
751b61a9ab Merge pull request #4065 from Poojawa/layering-memes 
Edited breast sprites
 2017-11-24 00:20:29 +00:00
deathride58
de27afbc61 Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045 
[MIRROR] Fixes component runtimes
 2017-11-24 00:19:42 +00:00
deathride58
f83ce9cd11 Merge pull request #4073 from Citadel-Station-13/upstream-merge-32937 
[MIRROR] Simple wall turret buff
 2017-11-24 00:19:24 +00:00
deathride58
6d6afcd588 Merge pull request #4091 from Citadel-Station-13/upstream-merge-33041 
[MIRROR] Lowers the stress the dna console puts on the string tree
 2017-11-24 00:11:16 +00: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
Jordan Brown
8943bf0184 Merge pull request #33041 from MrStonedOne/patch-452 
Lowers the stress the dna console puts on the string tree
 2017-11-23 12:07:17 -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
deathride58
d5a8e2f13b Update telecomms_designs.dm 2017-11-22 20:10:41 -05:00
deathride58
435ac739fc Update machine_circuitboards.dm 2017-11-22 20:09:18 -05:00
deathride58
5fb8856480 Update subsystems.dm 2017-11-22 20:07:57 -05:00
deathride58
cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801 
[MIRROR] Adds ip and cid to banning panel ban search
 2017-11-23 01:04:20 +00:00
deathride58
ad3608caeb Merge pull request #4075 from Citadel-Station-13/upstream-merge-32699 
[MIRROR] Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
 2017-11-23 01:03:38 +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
deathride58
c97e8805f6 Update hostile.dm 2017-11-22 17:53:36 -05:00
deathride58
eeaa90a897 Merge pull request #4079 from Citadel-Station-13/upstream-merge-32945 
[MIRROR] Fixes bad text2file call
 2017-11-22 22:41:28 +00:00
oranges
c2c22d56c7 [READY]NTnet refactor, assimilates exonet 2017-11-22 15:52:54 -06:00
oranges
2615ddd226 Merge pull request #32945 from tgstation/Cyberboss-patch-1 
Fixes bad text2file call
 2017-11-22 15:39:16 -06:00
Jordie
31b9828285 Adds ip and cid to banning panel ban search (#32801) 
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
 2017-11-22 15:38:07 -06:00
oranges
7c1fe79635 Merge pull request #32943 from ShizCalev/alium-softcrit-sprite 
Fixes aliums showing wrong sprite in softcrit
 2017-11-22 15:37:57 -06:00
GupGup
8458dc952c Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale 2017-11-22 15:24:21 -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
bf6f920754 Merge pull request #4059 from Citadel-Station-13/upstream-merge-32944 
[MIRROR] Update Turbine computer to use TGUI
 2017-11-22 20:49:58 +00:00
deathride58
1ab94199d1 Merge pull request #4046 from Citadel-Station-13/kevinz000-patch-1 
Makes magbullets that are non lethal not do brute damage
 2017-11-22 20:00:44 +00:00
deathride58
5e43516925 Merge pull request #4060 from Citadel-Station-13/upstream-merge-32955 
[MIRROR] Gives the R&D Server a description and makes its name improper
 2017-11-22 19:57:19 +00:00
deathride58
3b1067ba7a Update pants.dm 2017-11-22 14:56:26 -05:00
deathride58
c5adadc5d1 Update engineering.dm 2017-11-22 14:54:01 -05:00
deathride58
5d2c5add1f Update color.dm 2017-11-22 14:50:37 -05:00
deathride58
b24c9335b3 Update jobs.dm 2017-11-22 14:48:35 -05:00
deathride58
5e6e725666 Update color.dm 2017-11-22 14:47:15 -05:00
deathride58
2dbe3e3b82 Update chameleon.dm 2017-11-22 14:46:06 -05:00
deathride58
d86bdf2150 Update trash.dm 2017-11-22 14:44:09 -05:00
deathride58
7bc195c055 Merge pull request #4069 from Citadel-Station-13/upstream-merge-32970 
[MIRROR] `ahelp` command can now accept a ticket #
 2017-11-22 19:42:02 +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
deathride58
889defd2ce Update _event.dm 2017-11-22 14:29:13 -05:00
deathride58
8efbcc9cb0 Update time_track.dm 2017-11-22 14:28:25 -05:00
deathride58
2934effd36 Update blackbox.dm 2017-11-22 14:27:10 -05:00
deathride58
b925c0e265 Update server.dm 2017-11-22 14:20:45 -05:00
AnturK
64c7fa0cfd Simple wall turret buff (#32937) 
* Simple wall turret buff

* Adds mapper support
 2017-11-22 12:44:59 -06: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
Jordan Brown
5468bcc56f ahelp command can now accept a ticket # (#32970) 
* `ahelp` command can now accept a ticket #

As opposed to only a ckey

* Fix bad invocation of TicketByID()

* Use correct ahelp typepath
 2017-11-22 12:38:07 -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