Commit Graph

34960 Commits

Author SHA1 Message Date
PJBot
6bda36e6cb [ci skip] Automatic changelog update. 2017-10-13 18:43:33 +02:00
Rob Nelson
c8f26bf8d3 Merge pull request #16230 from MadmanMartian/floral_and_genetics
can now print floral and genetic data disks via the protolathe
2017-10-13 09:42:27 -07:00
Rob Nelson
4cb33ec5d9 Merge pull request #16229 from MadmanMartian/biomass_scything
Can now use a scythe against biomass
2017-10-13 09:42:08 -07:00
Rob Nelson
06bc6b6866 Merge pull request #16228 from MadmanMartian/invulnerable_wall_vulnerability
big mobs can no longer destroy invulnerable walls by smashing them
2017-10-13 09:41:32 -07:00
PJBot
62040665f2 [ci skip] Automatic changelog update. 2017-10-13 18:40:34 +02:00
Rob Nelson
71987be5ab Merge pull request #16220 from Shadowmech88/TheRightOfThePlayersToKeepAndBearArmBorersShallNotBeInfringed
Fleshshot Repair
2017-10-13 09:39:28 -07:00
Rob Nelson
3e4c6ead52 Merge pull request #16226 from ShiftyRail/MouseFix
Mouse fix
2017-10-13 09:38:31 -07:00
MadmanMartian
ae7a5d222c can now print floral and genetic data disks via the protolathe 2017-10-13 17:27:04 +01:00
MadmanMartian
a37aee7fb5 reworks biomass AGAIN, makes scythes function in a similar fashion against them as they do to vines 2017-10-13 16:27:15 +01:00
MadmanMartian
b176885754 big mobs can no longer destroy invulnerable walls by smashing them 2017-10-13 15:15:28 +01:00
MadmanMartian
7b66403fdc can no longer create multiple mass drivers on the same tile. 2017-10-13 14:25:18 +01:00
Shadowmech88
386c148b97 Makes suggested changes. 2017-10-13 07:15:02 -05:00
ShiftyRail
5d82f04744 Forgot to remove this shit 2017-10-13 12:12:47 +02:00
ShiftyRail
016d9c8194 I swear I'm not retarded 2017-10-13 12:09:37 +02:00
Shadowmech88
f259065669 Removes bugtesting stuff. 2017-10-13 04:13:34 -05:00
Shadowmech88
0760bf0769 Makes potion prices set themselves according to the base spell price define. 2017-10-13 04:08:59 -05:00
Shadowmech88
4115ba995a Adds wizard potions. 2017-10-13 03:52:58 -05:00
ShiftyRail
5b9c43eab7 Fix #16207 2017-10-13 09:14:43 +02:00
Damian
1516dc049a Remove crossbow frame recipe 2017-10-13 06:07:53 +02:00
Shadowmech88
6f5a63fa75 Adds basic potion item. 2017-10-12 22:45:48 -05:00
Shadowmech88
061782658e Major fleshshot code cleanup. 2017-10-12 18:38:25 -05:00
PJBot
0fbc931a5b [ci skip] Automatic changelog update. 2017-10-13 01:32:06 +02:00
Rob Nelson
450b1c2059 Merge pull request #16218 from DamianX/SpookyLantern
Lanterns can be spooked
2017-10-12 16:30:50 -07:00
MadmanMartian
0992a5e4cc adds the martian printer 2017-10-13 00:14:09 +01:00
Rob Nelson
14129c72b8 Allows me to become changeling whenever I want 2017-10-12 13:18:45 -07:00
PJBot
349d9b720c [ci skip] Automatic changelog update. 2017-10-12 19:41:38 +02:00
Rob Nelson
8e75ae6975 Merge pull request #16216 from DeityLink/20171012-Wood
Removing conductivity from some tiles & sheet
2017-10-12 10:40:25 -07:00
Rob Nelson
df127e0e35 Merge pull request #16212 from Unknown-as-Captain/patch-16
Lasagna
2017-10-12 10:39:53 -07:00
Damian
c467067d4c Lanterns can be spooked 2017-10-12 19:36:15 +02:00
Deity Link
376f6a8763 siemens 2017-10-12 15:50:07 +02:00
Unknown-as-Captain
2c4764dbcf meme 2017-10-11 20:25:33 -03:00
PJBot
5de1c9061f [ci skip] Automatic changelog update. 2017-10-11 23:25:54 +02:00
Rob Nelson
e7c122e28d Merge pull request #16204 from Zth--/smoothwall
Now walls properly smooth when destroyed
2017-10-11 14:24:48 -07:00
Rob Nelson
b9fbb86dcb Merge pull request #16205 from Emilc4h/bags
Changes the Atmospheric Technician's messenger bag
2017-10-11 14:23:52 -07:00
PJBot
c0edb45631 [ci skip] Automatic changelog update. 2017-10-11 23:20:10 +02:00
Rob Nelson
098f8fe2aa Merge pull request #16210 from DamianX/FlavorTextFixes
Flavor text fixes
2017-10-11 14:19:00 -07:00
Unknown-as-Captain
746c452483 Merge branch 'patch-16' of https://github.com/Unknown-as-Captain/vgstation13 into patch-16 2017-10-11 17:57:15 -03:00
Unknown-as-Captain
f1e4708ef1 Lasagna 2017-10-11 17:54:15 -03:00
Unknown-as-Captain
e1527d054d Lasagna 2017-10-11 17:53:38 -03:00
Unknown-as-Captain
00d79e3fb3 Update hub.dm 2017-10-11 15:54:30 -03:00
Unknown-as-Captain
37be82cfd3 commit name 2017-10-11 15:52:30 -03:00
Unknown-as-Captain
e11929811b Update hub.dm 2017-10-11 15:45:17 -03:00
Damian
d9a3b9adba That's another thing goonchat makes into a link 2017-10-11 20:38:13 +02:00
MadmanMartian
867688dc10 Fixes the last few points. now for live testing 2017-10-11 15:16:30 +01:00
PJBot
d580021375 [ci skip] Automatic changelog update. 2017-10-11 02:56:05 +02:00
The-Whargoul
735a3f238e Update PULL_REQUEST_TEMPLATE.md (#16211)
no change to the text, needed something to hook to a PR.
2017-10-10 19:54:58 -05:00
Damian
2531c1bc69 Flavor text fixes 2017-10-11 02:28:53 +02:00
DrSnips
d32091f66c Added some sords. 2017-10-10 19:01:05 -04:00
DrSnips
36cf5314fb Adds summon swords spell. 2017-10-10 18:18:57 -04:00
Rob Nelson
d8f0d2a443 Merge pull request #16203 from Unknown-as-Captain/patch-15
Tiny refactor of snacks.dm
2017-10-10 09:42:27 -07:00