Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Whitellama
7ced8104ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Whitellama
09907858f3
Added fingerprints and logs when wrenching fuel tanks, and added JMP buttons to logs regarding fuel tanks.
2014-08-17 15:51:01 -07:00
Whitellama
f1494c9b76
Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them.
2014-08-17 02:48:08 -07:00
Walter0o
26ae447079
removes pointless has_reagent() checks
...
remove_reagent() iterates safely through the holder list already,
unless you need to check a minimum amount,
or simply want to know if it is present, the call is not needed.
2014-08-11 13:01:27 +02:00
Walter0o
342fbdd136
fixes #5919 and some other reagent value issues
...
negative values everywhere.
2014-08-11 12:46:43 +02:00
Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Zuhayr
a2945a00d7
Merge pull request #5940 from mwerezak/power-net
...
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
Ccomp5950
06da9e8070
Merge pull request #5941 from Whitellama/master
...
Fixes #5577 , Dionaea crashing on death. Fixes #5838 , tomes not being able to be stored on bookshelves."
2014-08-10 18:53:11 -05:00
Whitellama
c87ad570f8
Cult tomes can't be destroyed with ethanol
2014-08-10 12:50:53 -07:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
Walter0o
e7c4f09aad
capsaicin and condensedcapsaicin changes
...
turns them into pain dealing reagents instead of burndamage dealing
2014-08-10 02:47:24 +02:00
Jarcolr
a3cbbe4d0b
Move through and pull blender
...
Changed density and anchored to 0.
2014-08-08 20:39:35 +03:00
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
Whitellama
dad248d49d
Fixed #5870 : Glasses being labeled both 'glass' and 'Drinking glass' inconsistently
2014-08-01 16:39:19 -07:00
Zuhayr
251b44a53c
Changed hydro trays, fertilizer and syringes over to use the reagent procs.
2014-07-30 12:24:03 +09:30
Zuhayr
ad8ef7c4ab
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-28 20:59:29 +09:30
Loganbacca
4861c5a5d4
Grammar tweak
2014-07-28 07:38:24 +12:00
Loganbacca
fbc9b03e73
Cup fix
...
- Grammar fix for drinking from cups
- Changed "Glass of Tomato juf" to "Glass of Tomato juice" (I'm assuming this was a typo)
2014-07-27 20:04:45 +12:00
Zuhayr
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
Zuhayr
d8336061b4
Merge branch 'hydroponics-pr' of https://github.com/Zuhayr/Baystation12 into dev
2014-07-25 23:02:21 +09:30
Zuhayr
5da36d265e
Merge resolution with PDA nanoui.
2014-07-25 22:57:53 +09:30
Zuhayr
57b790ad92
Merging.
2014-07-25 22:50:35 +09:30
Zuhayr
ea8b08c49b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hydroponics
2014-07-25 22:34:40 +09:30
Zuhayr
4d1812ba2b
Hydroponics rewrite, details will be in PR. Big commit.
2014-07-25 22:16:04 +09:30
Ccomp5950
11ab2ec412
Chem Master won't resize it's window by adding a scroll bar on selection.
...
Fixes #5574
2014-07-22 18:33:54 -05:00
Mloc-Argent
d5e9851b62
integrate XGM into the code
...
New turf proc: assume_gas(). Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
more.
Zones now process all fire data and existance in one go, fire objects
only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
structured for the new gas_mixtures.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-07-22 19:52:12 +01:00
Hubblenaut
52c0d83a2c
Cans now actually make use of the new 4x4 grid
2014-07-21 12:08:50 +02:00
Zuhayr
60d9d3d5e6
Merge resolution.
2014-07-21 16:34:38 +09:30
Zuhayr
ff38aca774
Merge resolution.
2014-07-21 16:17:15 +09:30
Whitellama
eb2ec42345
Fixed #5697 , grammatical error with empty glasses, cans, condiment containers
2014-07-19 16:22:09 -07:00
Zuhayr
3976433396
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-17 20:57:06 +09:30
mwerezak
1a52aa7b06
Merge remote-tracking branch 'upstream/dev' into op-hideout
2014-07-16 17:41:30 -04:00
Zuhayr
f4ff51f146
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:32:00 +09:30
Zuhayr
f795712a95
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-07-16 19:30:41 +09:30
Hubblenaut
4ee6b77289
Adds new syndicate closet and adjusts nuke setup
2014-07-15 17:22:03 +02:00
Hubblenaut
38895916b6
Adds grey shuttle tiles and drug syringes
2014-07-15 17:20:04 +02:00
Ccomp5950
67bf27e6f4
Merge pull request #5602 from Hubblenaut/food
...
Grid Placement for Food
2014-07-15 01:22:47 -05:00
mwerezak
f2845dbe76
Thrown items can be targeted, has miss chance...
...
...based on distance, similar to projectiles.
2014-07-15 01:14:04 -04:00
Mloc
48cea3dbb3
Merge pull request #5578 from Faerdan/dev
...
NanoUI Update
2014-07-14 23:35:49 +01:00
Hubblenaut
c920b0234f
Renames CoM into center_of_mass
2014-07-14 23:13:46 +02:00
Whitellama
a6b4f5d2aa
Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans
2014-07-13 23:23:26 -07:00
Zuhayr
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
Hubblenaut
b7778ff420
Fixes merge conflict
2014-07-13 21:35:31 +02:00
Hubblenaut
31637edf76
Introduces function for exact item placement of food and applies it to each food item in the game
2014-07-13 19:37:33 +02:00
Kelenius
aad89409de
Slime update
2014-07-13 17:37:30 +04:00
mwerezak
c0487b9c90
Fixes human internal organs list
2014-07-12 16:15:37 -04:00
Mark Aherne
aaa5ad1002
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-07-12 00:42:06 +01:00
Mark Aherne
6c12d62285
Merge branch 'dev' of https://github.com/Faerdan/Baystation12 into dev
2014-07-11 10:53:08 +01:00
Mark Aherne
7e7e6cd8ac
Continued work in progress on a major revision of the NanoUI templating system.
2014-07-11 10:48:42 +01:00
