0b07f80b62
custom docker improvements ( #32626 )
2017-11-24 12:59:17 -06:00
c43591982a
Refactor on_reagent_change to pass through the change type
2017-11-24 12:59:09 -06:00
525ef1bc65
gives janitors a liiiiiiiiiiiiil leeway
2017-11-24 01:59:39 -05:00
d5d89a57b4
Update stock_parts.dm
2017-11-23 23:50:25 -05:00
2147c60b7f
Replaces "console screen" stock part with glass sheets
2017-11-23 18:53:47 -06:00
399c2ebfcc
Update _compile_options.dm
2017-11-23 16:37:49 -08:00
751b61a9ab
Merge pull request #4065 from Poojawa/layering-memes
...
Edited breast sprites
2017-11-24 00:20:29 +00:00
de27afbc61
Merge pull request #4093 from Citadel-Station-13/upstream-merge-33045
...
[MIRROR] Fixes component runtimes
2017-11-24 00:19:42 +00:00
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
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
eb722bf59f
Merge branch 'master' into upstream-merge-33045
2017-11-24 00:10:36 +00:00
b2bb942817
Fixes component runtimes
2017-11-23 13:12:38 -06:00
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
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
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
d5a8e2f13b
Update telecomms_designs.dm
2017-11-22 20:10:41 -05:00
435ac739fc
Update machine_circuitboards.dm
2017-11-22 20:09:18 -05:00
5fb8856480
Update subsystems.dm
2017-11-22 20:07:57 -05:00
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
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
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
72f14418f1
Update holder.dm
2017-11-22 17:59:42 -05:00
738c1b7b2a
Update implantuplink.dm
2017-11-22 17:57:43 -05:00
1d4e3612ea
Update PDA.dm
2017-11-22 17:56:49 -05:00
c69f933f15
Update uplink_items.dm
2017-11-22 17:55:49 -05:00
c97e8805f6
Update hostile.dm
2017-11-22 17:53:36 -05:00
29d4b023f0
Update podpeople.dm
2017-11-22 17:51:36 -05:00
6bfba3ea03
Update lizardpeople.dm
2017-11-22 17:50:23 -05:00
93a2d653bf
Update humans.dm
2017-11-22 17:48:56 -05:00
3f07d95b56
Update corporate.dm
2017-11-22 17:46:40 -05:00
fc2a0f48fa
Update DNA.dm
2017-11-22 17:45:15 -05:00
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
8d39fb9dce
merges https://github.com/tgstation/tgstation/pull/32678
2017-11-22 17:40:25 -05:00
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
60b2c25668
donator item modularization + manual sync of sprites upstream
2017-11-22 17:16:37 -05:00
c2c22d56c7
[READY]NTnet refactor, assimilates exonet
2017-11-22 15:52:54 -06:00
2615ddd226
Merge pull request #32945 from tgstation/Cyberboss-patch-1
...
Fixes bad text2file call
2017-11-22 15:39:16 -06:00
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
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
783960a986
Divides species in subtypes, makes viruses able to infect certain subtypes
2017-11-22 15:36:43 -06:00
8458dc952c
Fixes hostile mobs attacking surrounding tiles when trying to attack someone: the stunning finale
2017-11-22 15:24:21 -06:00
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
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
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
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
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
3b1067ba7a
Update pants.dm
2017-11-22 14:56:26 -05:00
c5adadc5d1
Update engineering.dm
2017-11-22 14:54:01 -05:00
5d2c5add1f
Update color.dm
2017-11-22 14:50:37 -05:00
b24c9335b3
Update jobs.dm
2017-11-22 14:48:35 -05:00
Emmett Gaines