Commit Graph

892 Commits

Author SHA1 Message Date
PJB3005
ae7ab25539 BAY LIGHTING PEOPLE 2015-06-06 22:15:21 +02:00
d3athrow
207ecebee0 Merge pull request #4762 from Kurfursten/oldfixes
Bug Fixes for May 9th
2015-05-30 11:29:56 -05:00
Kurfursten
e1279e17cf Old fixes 2015-05-30 10:09:26 -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
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
DeityLink
213225c674 BUT JOHNNY YOU CANNOT STAND 2015-05-25 05:07:31 +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
d971190f3b Merge pull request #4480 from DeityLink/B52
FLAMMING B52
2015-05-23 15:42:06 -05:00
DeityLink
f8241606f7 MHKAY 2015-05-23 21:03:19 +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
4f8c4447ed methylphenidate 2015-05-23 08:35:26 +02:00
D3athrow
a6885a42d3 Fixes #4541 2015-05-19 02:49:22 -05:00
D3athrow
00077a22d3 runtime fix 2015-05-18 01:56:30 -05:00
D3athrow
c96b4e3d71 remove assert 2015-05-17 22:06:45 -05:00
D3athrow
3b9fe56918 Fix not being able to fill from reagent dispensers 2015-05-17 20:50:34 -05:00
D3athrow
590848fe82 Temporarily fix #4516 2015-05-17 17:55:56 -05:00
d3athrow
4afb537d27 Merge pull request #4116 from wwjnc/oh-god-help-me
More feature freeze fixes please kill me
2015-05-17 14:20:48 -05:00
D3athrow
b3d6262c1b Head cultists can be deconverted again 2015-05-16 14:27:08 -05:00
wwjnc
ddf95adbb6 Squashed commit for PR #4116. Fixes #4005, fixes #3216, fixes #3699,
fixes #3196.

  - Fixes welder fuel being spread/created on space turfs.

  - Added missing `src = null` statements in some reagent reactions.

  - Removed duplicate virus food recipe and fixed the current one.
    The new recipe apparently was from some virology rework and
    conflicted with the old one. The current recipe has been tweaked
    to match the wiki: 5u milk + 5u water gives 15u virus food.

  - Moved transfer/splash code to the reagent_container/transfer() proc.
    No more copypasted code everywhere, hopefully.

  - Fixed some (pills, holy water bottle, drink glasses, shakers...)
    `reagent_containers` being able to transfer contents at a distance.

  - Added a `return 1` in some `attackby()` to avoid having them call
    `afterattack()`. Reduces amount of snowflake code and kills ninjacode
    in `reagent_containers`.

  - Added helper procs to log game events/reagent transfers.

  - Removed copypasted code from spray/chemsprayer and syringe code
    and refactored it a bit.

  - Fixed trans_to() not handling blood transfers correctly.

  - Less painful copypasted logging code.

  - Why am I even alive

  - Modernized things, removed more snowflake.

  - Welder fuel and flamethrower decals are now pooled.

  - `transfer_sub` now typechecks properly

  - `splash_sub` now handles correctly and gives a message when
    splashing something with `amount = 0` or without reagents

  - Added `is_empty()` proc to `/datum/reagents`

  - Added `animate_movement` to the pooler's ignore list to fix
    a bug where pooled objects would get that var reset to 0
    instead of their overriden value for some reason.
2015-05-15 08:58:39 +02:00
d3athrow
15d95d86df Merge pull request #4374 from 9600bauds/whymefryme
goofball's shit 2: return of goof: goof in time
2015-05-14 12:16:43 -05:00
9600bauds
27fe764f55 Weighted color averaging for reagents 2015-05-12 14:40:22 -03:00
D3athrow
f3e9002795 Fix long range mortars 2015-05-12 10:53:19 -05:00
d3athrow
6b1a849d51 Merge pull request #4392 from 9600bauds/i'mblue
Fixes wrong color averaging
2015-05-12 02:24:39 -05:00
d3athrow
0a307ae5c5 Merge pull request #4333 from 9600bauds/paper2thepapening
Paper folding, paper burning, & other long-overdue useless paper stuff
2015-05-12 02:09:46 -05:00
D3athrow
9c21244617 REVERT GAS DATUMS UNTIL COMIC FIXES THE PERFORMANCE ISSUES: PLEASE WORK ON THE GASDATUMS BRANCH https://github.com/d3athrow/vgstation13/tree/gasdatums in the mean time. 2015-05-10 22:55:46 -05:00
9600bauds
2068723792 Fixes wrong color averaging 2015-05-10 18:39:36 -03:00
9600bauds
47e7ebc00f comment scare 2015-05-10 15:31:25 -03:00
9600bauds
b2913489a2 sliceable custom food&bread 2015-05-09 20:06:54 -03:00
ComicIronic
1d0c272f4a Fixes as many instances of not using set_volume, set_temperature, and the proper adjust_gas args as I could find. 2015-05-09 18:46:58 +01:00
ComicIronic
c1a58dc3c3 Gas math stripping
Removed update_values(). RIP, shine on you CPU diamond.
Removed get_moles_by_id and get_archived_moles_by_id, all moles are now accessed directly to reduce call cost.
Added set_temperature and set_volume procs which recalc pressure when temperature or pressure change.
Heat_capacity is now a var updated when gases update.
Modified adjust_gas to use set_gas, modified set_gas to alter heat_capacity, total_moles, and pressure as needed.
2015-05-09 18:43:24 +01:00
9600bauds
f3021845b8 verb guacamole 2015-05-07 19:41:33 -03:00
d3athrow
df587165eb Merge pull request #4225 from Kurfursten/civdelight
Civilian's Delight
2015-05-07 01:47:24 -05:00
D3athrow
e189fd67fd Fixes #4310
u_equip(W) now calls W.dropped() by default, if you dont want it to do u_equip(W,0)
2015-05-05 22:46:40 -05:00
d3athrow
d408492983 Merge pull request #4276 from FudgePucker/patch-1
Adds Circuit boards for the non chem dispensers.
2015-05-04 21:58:31 -05:00
FudgePucker
86aea1e3c1 You don't get to bring commits Dr Pavel 2015-05-04 16:14:02 -04:00
FudgePucker
9de8591dd6 Hopefuly I don't crashing this code.
WITH NO SURVIVORS
2015-05-04 16:06:22 -04:00
FudgePucker
b69fc8350e I must go write "do not copy and paste with out proofreading" on the board 100 times now. 2015-05-04 15:34:56 -04:00
FudgePucker
82d2710fbf Add parts so they can be made. 2015-05-04 14:30:46 -04:00
ComicIronic
4d432e5240 Gas Datums
Moved gas_mixture gas numbers to a list which is connected to a global gas_datum list, like with reagents.
Modified some maths procs to be more sane, added adjust_gas and set_gas to help with processing.
Added a modular system for gas flags - gases can now be marked as fuel and oxidiser with a flag, logged with a flag, scanned with a flag, etc.
Changed scrubbers to use a list of scrubbing gases rather than a set of vars.
Made miners and xenoarch effects more sensible - they now produce gas by ID, not manually.
Made turfs' starting gases into a list, removed turf gas number vars.
2015-05-04 10:36:04 +01:00
D3athrow
58d3239d37 Merge branch 'Kurfursten-soldering' into Bleeding-Edge 2015-05-03 18:56:18 -05:00
Kurfursten
8b402448bc Adds Soldering Irons 2015-05-03 18:52:50 -05:00
d3athrow
6900e541e9 Merge pull request #4242 from Kurfursten/misccon
Misc. De/con
2015-05-02 22:55:12 -05:00
d3athrow
3a4b5ac860 Merge pull request #4210 from ComicIronic/RyeFixDis
Ryetalin fixes maybe
2015-05-02 22:40:10 -05:00
Kurfursten
2713d871a7 Misc additions 2015-05-02 05:46:20 -05:00