Commit Graph

10291 Commits

Author SHA1 Message Date
d3athrow
cd9bab7f95 Merge pull request #4699 from gbasood/Hotfix-5-26
Fixes runtimes on several things.
2015-05-27 00:02:09 -05:00
D3athrow
23b17e3314 fuck 2015-05-26 20:39:49 -05:00
gbasood
7f09c93f33 Fixes runtimes on several things.
- Fixes pipes that are inside fires not lighting (why are pipes not being
destroyed by fire in the first place)

 - Fixes cluwnes runtiming.

 - Fixes spell hud runtime.
Someone who understand what master in hud objects actually refers to
should figure out what the best solution is, though.
2015-05-26 18:23:27 -07:00
D3athrow
082cb488da I swear this is gonna bite me in the ass 2015-05-26 19:49:47 -05:00
d3athrow
dad7847091 Merge pull request #4658 from DeityLink/gyrooo
[Feature & Bugfix] Gyro tea and Pun Pun
2015-05-26 10:16:35 -05:00
d3athrow
7e20542915 Merge pull request #4665 from ComicIronic/GetReady
Away mission preparations.
2015-05-26 10:15:47 -05:00
d3athrow
f98b6a3e0d Merge pull request #4675 from 9600bauds/pleasekeepbodypartsinsidetherollerbedatalltimestheridedoesnotforgive
Makes pulling buckled mobs instead try to pull the thing they're buckled onto
2015-05-26 10:15:11 -05:00
DeityLink
0551a56694 spawn() 2015-05-26 12:20:51 +02:00
9600bauds
a18b70b3dd Pulling buckled mobs now pulls the thing they're buckled to 2015-05-25 22:02:46 -03:00
D3athrow
4936b9b1c7 mo nanomapss 2015-05-25 16:57:37 -05:00
D3athrow
c23c81098b banbanbanbanbanban 2015-05-25 14:46:59 -05:00
d3athrow
c73c13880c Merge pull request #4633 from Unfit/stufff
Fixes bugs and adds features
2015-05-25 13:47:28 -05:00
d3athrow
5fe76af16c Merge pull request #4617 from Shadowmech88/potato_salad
Adds potato salad to the game.
2015-05-25 13:46:01 -05:00
d3athrow
89acf7b7a8 Merge pull request #4602 from Probe1/Meat_Migration
Moving meat types from snacks.dm to meat.dm
2015-05-25 13:44:59 -05:00
ComicIronic
048527a429 Away mission preparations.
Added the addZLevel proc, used to sanitize map init and generate the accessable_z_levels list, which is no longer hardcoded.
Fixed a couple of maps I ended up using in testing.
Added more debug data to a debug verb for maps.
Added the movementJammed var, which stops a zlevel being reachable by drift.
Added the movementChance var, which controls how likely a zlevel is to be reached by drifting.
Made the maploader add any new zlevels it creates to the map's zlevel list.
2015-05-25 17:34:25 +01:00
DeityLink
213225c674 BUT JOHNNY YOU CANNOT STAND 2015-05-25 05:07:31 +02:00
d3athrow
bad0c0d281 Merge pull request #4650 from DeityLink/Bleeding-Edge
Adminbus Singulo Fix
2015-05-24 17:17:43 -05:00
DeityLink
69be2977cf Adminbus Singulo Fix 2015-05-24 22:58:52 +02:00
ComicIronic
d9c69d52df Taxi fixes:
MoMMI nest now has double windoors and sulphuric acid.
Miners and xenoarch now start with tank dispensers.
HoP office expanded, charger placed on wall, accounts DB now accessible.
Engineering given more toolbelts.
Atmos large tanks fixed to start with proper gases in them.
Solar computers given correct wiring.
Captain's office now connected to grid, and contains antique laser display case.
Bhangmeter added to toxins.
Renamed Break Room airlock and removed sink.
Added desk bells where appropriate.
Extended Custodial closet by 1 tile.
Fixes #4625, fixes #4623, fixes #4624, fixes #4614, fixes some of #4629.
Fixes #4632, miners now have proper access around the station.
2015-05-24 14:06:55 +01:00
Unfit
f1a947b5c1 removed duny
ripley now cant destroy supermatter shard (and live)
captains start with ENERGY GUNS holy fuck
third attempt at ficxing vending machines
2015-05-24 14:07:53 +02:00
Unfit
f09efd4716 REMOVE BUGHS
LIGHT TILES ARE FINALLY GOOD (they need 2 wire instead of 5, they stack
automatically AND it only takes a few seconds now to finish them with
metal)
Second attempt at fixing vending machines
Tourettes no longer stuns
2015-05-24 13:49:08 +02:00
Shadowmech88
cb1b522c16 Adds potato salad to the game.
Adds potato salad icon to icons/obj/food.dmi
Adds potato salad object to
code/modules/reagents/reagent_containers/food/snacks.dm
Adds potato salad recipe to code/modules/food/recipes_microwave.dm
2015-05-23 21:20:42 -05:00
d3athrow
2bc5cfb18c Merge pull request #4613 from DeityLink/B52
[HOTFIX] put an additional update_brightness() that should fix B52 glasses staying lit
2015-05-23 17:52:10 -05:00
Probe1
31471f80cd Moved meatbread to bottom of list to stop it from interfering with xemomeatbread and spidermeatbread. Changed order of microwave ingredient labels on advice from Comic to be in line with new obj file. 2015-05-23 18:50:33 -04:00
DeityLink
00d79aa2ec update_brightness 2015-05-24 00:37:55 +02:00
d3athrow
d366050df9 Merge pull request #4579 from gbasood/hotfix-HUDTargetingPoolingNull
Fixes ReturnToPool being given null objects by remove_gun_icons
2015-05-23 15:43:16 -05:00
d3athrow
3adac09d47 Merge pull request #4597 from ComicIronic/TaxiBattery
Taxistation power changes
2015-05-23 15:43:07 -05:00
d3athrow
b80671d899 Merge pull request #4607 from ComicIronic/VentMessages
Adds ventcrawling messages for temperature and pressure
2015-05-23 15:42:49 -05:00
d3athrow
f5d84a956f Merge pull request #4472 from DeityLink/medcomp
[Sprites] New and Improved Medbay Computer sprites
2015-05-23 15:42:30 -05:00
d3athrow
d971190f3b Merge pull request #4480 from DeityLink/B52
FLAMMING B52
2015-05-23 15:42:06 -05:00
d3athrow
3998037d0d Merge pull request #4488 from DeityLink/monkeycheese
[Feature] Adds Methylin, and revamp Monkey-Machine interaction
2015-05-23 15:41:58 -05:00
DeityLink
f8241606f7 MHKAY 2015-05-23 21:03:19 +02:00
ComicIronic
b0e7c8d286 Adds ventcrawling messages for temperature and pressure
Also moves some code into ventcrawl.dm, because it had no business being in carbon.dm and it wasn't even carbon-exclusive.
2015-05-23 19:36:29 +01:00
DeityLink
0ad4a92287 fine 2015-05-23 10:07:40 +02:00
DeityLink
eeb21007ea better 2015-05-23 10:07:39 +02:00
DeityLink
9af54cc1e4 BARTENDER LIGHTS THE B-50 WITH THE ENERGY SWORD 2015-05-23 10:04:07 +02:00
DeityLink
40638d7393 KAY 2015-05-23 10:00:42 +02:00
DeityLink
b79b912a86 FLAMMING B52 2015-05-23 10:00:42 +02:00
DeityLink
cdffc4ffc0 cult update 2015-05-23 09:54:22 +02:00
DeityLink
973e6eee89 aaah 2015-05-23 08:35:27 +02:00
DeityLink
4f8c4447ed methylphenidate 2015-05-23 08:35:26 +02:00
ComicIronic
1c4daf287e Taxistation power changes
Added portable batteries to all three Taxistation stations. The non-engineering batteries start with 2e6 charge.
Added charging ports to engineering.
Made rad collectors start anchored.
Edited SMES code to use a general system for starting with a terminal.
Reduced portable battery max capacity to 3e6 from 5e6. This is to stop them outclassing SMESs.
2015-05-22 23:49:19 +01:00
d3athrow
9376e300f2 Merge pull request #4555 from ComicIronic/SMESBatteries
SMES Cleanup + Portable Batteries
2015-05-22 12:10:54 -05:00
d3athrow
e25f7b2ea2 Merge pull request #4591 from Unfit/help7
Two small fixes
2015-05-22 12:08:02 -05:00
d3athrow
010f9ee0b1 Merge pull request #4550 from dylanstrategie/Bat
Fix potential runtimes with Cult mobs
2015-05-22 12:07:24 -05:00
dylanstrategie
bf3b678a0b Actually that check isn't needed at all, shiggy diggy do 2015-05-22 18:18:13 +02:00
Unfit
9c93c0604a Two small fixes
Examining a body without a head no longer tells you about its missing
brain or brain damage
Lit candles are now hot - you can light cigarettes with them
2015-05-22 15:56:53 +02:00
gbasood
5a2bb5653b Fixes ReturnToPool receiving objects that don't even exist
I'm pretty sure this is currently the only thing failing the assertion I added in returnToPool(), but if anything else was triggering it, it was culled from the runtime logs from last round.
2015-05-21 16:03:44 -07:00
d3athrow
7128895b91 Merge pull request #4482 from DeityLink/doomguy
Doomguy clothes and cleanup
2015-05-21 15:01:22 -05:00
d3athrow
37757101b5 Merge pull request #4515 from 9600bauds/cmogriffinme
Cloning console messages for ghosted players, defib fixes & I forgot to set the title
2015-05-21 15:01:01 -05:00