Commit Graph

20332 Commits

Author SHA1 Message Date
unid15
d478f549c9 shuttle fixes 2015-10-24 13:52:46 +02:00
clusterfack
cb550c6723 Merge pull request #6263 from clusterfack/stuff
Improves R&D
2015-10-23 00:03:14 -05:00
clusterfack
d9c770ee2f Merge pull request #6255 from DeityLink/fixruntime
fixes
2015-10-22 19:06:29 -05:00
DeityLink
0bc6fdf3d3 fixing conflicts 2015-10-22 18:22:46 +02:00
DeityLink
191ba087b1 aaah 2015-10-22 18:21:32 +02:00
clusterfack
9fa381a1a1 Improves R&D
1. The research console now displays the true values of the costs used in creating objects (dependent upon resource coefficient)
2. The circuit imprinter now correctly varies chemical cost with resource coefficient
3. The general output material proc now was improved to display reagents as well and is now actually used
4. The following things now all use list2text for much greater string concatenation performance at runtime
- R&D Console (s h i t t y)
- AI announcement verb help (previously took .2 server seconds every time it was called)
- Power Monitor
2015-10-22 06:08:12 -05:00
Rob Nelson
ca947445e4 Merge pull request #6262 from clusterfack/virus
New Virus
2015-10-22 00:15:14 -07:00
clusterfack
65866520e3 New Virus
Final Stage Symptom
Blows up fat people with mint toxin
Goes great with gabens syndrome!

Could be considered beneficial (for a final stage symptom), but still kills people if you aren't careful. Now that's what I expect from a final stage symptom!
2015-10-22 01:29:24 -05:00
clusterfack
905e321cb2 Merge pull request #6253 from clusterfack/vent
Fixes runtime
2015-10-21 20:08:09 -05:00
DeityLink
6b68ae3500 fixes 2015-10-22 03:00:53 +02:00
clusterfack
6db479a1bb Fixes runtime
If an action item was destroyed fully this could and would runtime
2015-10-21 19:48:13 -05:00
Rob Nelson
3e06266530 Merge pull request #6247 from DeityLink/smallnova
Fixed something related to potted plants
2015-10-21 13:11:21 -07:00
DeityLink
a564e315f6 small mutated plants 2015-10-21 21:38:30 +02:00
Rob Nelson
99835f7ecf Merge pull request #6213 from Arthurdentist/MagicStuff
New Loadouts for Wizard Apprentice
2015-10-21 12:29:41 -07:00
Rob Nelson
4868a7b168 Merge pull request #6245 from unid15/m
Shuttle fixes
2015-10-21 12:27:59 -07:00
Rob Nelson
7049078c60 Merge pull request #6207 from dylanstrategie/Combat-Log
Add Silicon cell removal to attack logs, change to visible_message
2015-10-21 12:26:54 -07:00
D3athrow
540df434be fix runtime bait if theres no luminosity at all when get_lumcount is called. 2015-10-21 12:32:53 -05:00
unid15
40d5f535af shuttle fixd 2015-10-21 17:18:37 +02:00
Rob Nelson
bf7481cbf3 Merge pull request #6238 from clusterfack/vent
Ventcrawling changes
2015-10-20 21:43:53 -07:00
clusterfack
5c335b7b8b Ventcrawling changes
Fixes #5573
Fixes #5891
Fixes #6191
Centralized some code for ventcrawling in ventcrawl.dm
Made passive vents a type to be checked for ventcrawling into
Made hunters able to carry things into vents apparently
Gave contortionist jumpsuit a verb to ventcrawl with for the scrubs who dont know hotkeys
2015-10-20 23:26:18 -05:00
Rob Nelson
7cf77f4d29 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-20 17:56:27 -07:00
Rob Nelson
f178d5a031 hotfix for mommi spawner not spawning soviet mommis. 2015-10-20 17:55:31 -07:00
Rob Nelson
242511bcee Merge pull request #5713 from PJB3005/NTSL
NTSL Stuff.
2015-10-20 17:05:33 -07:00
Rob Nelson
6bac0fe266 Merge pull request #6235 from Kurfursten/egghotfix
Borer Egg Hotfix
2015-10-20 15:17:16 -07:00
Kurfursten
4a9ac93e8c Path change 2015-10-20 16:57:54 -05:00
Rob Nelson
1d19c6654c Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into Bleeding-Edge 2015-10-20 14:47:37 -07:00
Rob Nelson
f5366a1155 MoMMI fixes 2015-10-20 14:41:10 -07:00
Rob Nelson
93813b9e72 Merge pull request #6184 from dylanstrategie/Mat_Synth
Fix broken Mat Synth R&D Values
2015-10-20 11:47:08 -07:00
Rob Nelson
22e8d2fe47 Merge pull request #6186 from DeityLink/lighticon
Antag icons now appear above the lighting layer, as well as on Mechas
2015-10-20 11:46:17 -07:00
Rob Nelson
3a0ad69ade Merge pull request #6193 from PJB3005/SDQL
In which I give admins even more power.
2015-10-20 11:45:45 -07:00
Rob Nelson
0ea55f086b Merge pull request #6217 from Arthurdentist/iconfix
Fixes #6209
2015-10-20 11:44:47 -07:00
Rob Nelson
72175e41c5 Merge pull request #6225 from DeityLink/combs
Allowing plant bags to carry honeycombs
2015-10-20 11:44:27 -07:00
Rob Nelson
4cb7f32689 Merge pull request #6228 from Kurfursten/cardboardrecycl
Recycling Cardboard
2015-10-20 11:44:02 -07:00
PJB3005
5089b20d4e Lighting 4: The commenting. 2015-10-20 20:37:41 +02:00
Kurfursten
dba3150735 Updates recycling 2015-10-20 12:10:51 -05:00
Arthurdentist
ab114f6e9b Adds two new loadouts 2015-10-20 17:25:18 +01:00
PJB3005
0243d39c1c Fixes the permissions exploit. 2015-10-20 17:54:34 +02:00
Kurfursten
9544060418 Done 2015-10-20 10:33:08 -05:00
DeityLink
2d9934f1f2 plant bags carry honeycombs 2015-10-20 17:17:04 +02:00
Arthurdentist
25bba3813a Makes prisms constructable 2015-10-20 01:07:32 +01:00
Rob Nelson
6102e3ad8f Merge pull request #6190 from DeityLink/tempay4colleg
some economy stuff
2015-10-19 17:05:53 -07:00
Rob Nelson
330b013f40 Merge pull request #6192 from unid15/halflife2
Adds wizard simple mob
2015-10-19 17:05:39 -07:00
Rob Nelson
bf670ca49d Merge pull request #6195 from unid15/kraken
Makes kitchen trays look better
2015-10-19 17:04:33 -07:00
Rob Nelson
a490da750b Merge pull request #6210 from unid15/wheelchair2
Better wheelchair animation + wheelchairs no longer protect from sprays
2015-10-19 17:03:06 -07:00
Rob Nelson
4d1d278c48 Merge pull request #6215 from Arthurdentist/iconfix
fixes #6212
2015-10-19 17:02:43 -07:00
Arthurdentist
faddf7c59a fix 2015-10-20 00:30:58 +01:00
Arthurdentist
58cb94325d Adds two new apprentice schools 2015-10-19 23:53:33 +01:00
Rob Nelson
b76413cea4 Fix handle_speech runtimes 2015-10-19 15:39:39 -07:00
unid15
188ae2b5ab changelog 2015-10-19 20:41:35 +02:00
unid15
def74c966b better wwheelchair 2015-10-19 20:20:47 +02:00