Commit Graph

5523 Commits

Author SHA1 Message Date
GunHog
f4407871ab Merge remote-tracking branch 'remotes/upstream/master' into Borgie_Lights
Conflicts:
	code/game/gamemodes/shadowling/shadowling_abilities.dm
2015-07-18 21:56:25 -05:00
Remie Richards
57b05f5a18 Merge pull request #10493 from phil235/SmokeFoamBuff
Foam&Smoke buff, some tweaks to sorium/ldm effect, plus some fixes.
2015-07-18 03:45:38 +01:00
Cheridan
a4a7c21744 Merge pull request #10653 from phil235/Fixarino
Three simple fixes again
2015-07-17 15:49:41 -05:00
Cheridan
41890b2845 Merge pull request #10637 from phil235/ShowerBurnFix
Shower Fix
2015-07-17 15:34:29 -05:00
phil235
7cd4a09ed7 Merge pull request #10592 from AlexanderUlanH/tables
Brings Tabling in line with newer stuns
2015-07-16 19:38:14 +02:00
phil235
9463dd7e70 Merge pull request #10613 from Ikarrus/rwindow-heat
Reinforced windows and windoors are a bit more resistant to fires and blasts
2015-07-16 18:42:45 +02:00
phil235
3e9ab4e3c1 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/__HELPERS/unsorted.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/modules/reagents/Chemistry-Recipes.dm
2015-07-16 14:09:12 +02:00
phil235
e968c9e03c Fixes dog bed dropping metal on deconstruction.
Fixes damp rag smothering not giving a bold red message to the victim.
Fixes curare not properly weakening mobs.
2015-07-16 13:04:44 +02:00
duncathan
ae417d2a03 Merge branch 'master' of https://github.com/tgstation/-tg-station into atmosrefactor2
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary_devices/Freezer.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/unary_base.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/modules/events/vent_clog.dm
	code/modules/mob/living/carbon/human/species.dm
	config/admins.txt
2015-07-16 04:27:25 -06:00
Firecage
2641e1a684 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Procs 2015-07-15 23:52:55 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Cheridan
92f728077e Merge pull request #10612 from Ikarrus/grenades_burn
Fixes grenade casings burning forever
2015-07-15 14:30:07 -05:00
phil235
5f7afb8782 Let's not spam people with drenching messages. 2015-07-15 20:08:53 +02:00
phil235
5a78777daf Changed carbon/clean_blood() to carbon/human/clean_blood() and moved it from carbon.dm to human.dm since it only did stuff for humans.
Fixes showers not being processed correctly, especially for mobs. (processing will a bit more intensive unfortunately)
Fixes showers not cleaning bloody human hands.
Remove the now unused checkeyes() proc.
2015-07-15 19:49:23 +02:00
phil235
de288d013e Merge pull request #10591 from bustygoku/Under-Pressure
Tanks Show Pressure When Examined
2015-07-14 15:51:47 +02:00
Cheridan
a7b0b9c62f Merge pull request #10477 from ojacobson/screwdriverspamfix
Fix consistency issues with eyeball screwdrivers
2015-07-14 00:41:00 -05:00
Ikarrus
2bc5fd2db9 Reinforced windows and windoors are a bit more resistant to fires and blasts
- Regular windows/windoors: 1073k
- Reinforced windows/windoors: 1873k
- Reinforced windows/windoors will count as walls for blast range calculation (The lowest possible value)
2015-07-13 23:31:34 -06:00
Ikarrus
83a435273e Fixes grenade casings burning forever 2015-07-13 22:48:01 -06:00
Cheridan
723e6d6358 Merge pull request #10561 from xxalpha/hugboxone
Adds an empty hugbox.
2015-07-13 22:11:11 -05:00
bustygoku
4d0739c387 LowerCase K 2015-07-13 17:31:50 -07:00
Remie Richards
f08d4f4085 Merge pull request #10554 from nukeop/rcdbugfix
Fixes RCD-related issues
2015-07-14 01:04:48 +01:00
phil235
72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
2015-07-14 01:02:37 +02:00
bustygoku
bde367b9b9 KPa Added 2015-07-13 15:30:21 -07:00
Alexander P. Ulan Hernandez
d7ee8b9032 Might as well fix this while there's a more controvercial PR 2015-07-13 08:51:37 -04:00
bustygoku
de699d3b5b Tanks Show Pressure When Examined 2015-07-13 04:09:39 -07:00
WJohn
37cfc11cd4 Merge pull request #10481 from Ikarrus/ganggangganggang
Gang Mode Update
2015-07-12 19:37:54 -04:00
duncathan
71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
xxalpha
66e2941531 Adds an empty hugbox for admins to give.
Maintbox

Re-added hugbox to boxstation perma.
2015-07-12 17:44:13 +01:00
Swag McYolosteinen
4878a7b8d5 Merge pull request #10531 from duncathan/rpddelay
Speeds up RPD and pipe unwrenching
2015-07-12 12:41:49 +02:00
Swag McYolosteinen
81ec442d50 Merge pull request #10512 from duncathan/traygoggles
Adds t-ray scanner goggles for atmos techs
2015-07-12 12:41:37 +02:00
duncathan
27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
Cheridan
a0a20b0b0a Merge pull request #10484 from Ikarrus/augmaintenance
Makes augmentations more difficult to maintain
2015-07-11 19:54:58 -05:00
duncathan
e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
WJohn
4be10fcce5 Merge pull request #10529 from xxalpha/smoothballs
Fixed gases deleting all overlays of a turf when spreading.
2015-07-11 20:27:22 -04:00
Cheridan
61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan
68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
barackobama
f02c32c8ee fixes #10547, adds progress bars to grilles and windows, also fixes #9748
I guess
2015-07-11 19:49:32 +01:00
barackobama
2694fab4d8 fixes RCD-related issues 2015-07-11 19:15:33 +01:00
xxalpha
bd6ebcbd69 Fixed nest overlays being deleted when unbuckling a mob. 2015-07-11 02:20:50 +01:00
duncathan
c870469a39 speeds up RPD and pipe unwrenching 2015-07-10 18:03:43 -06:00
phil235
f580ad3863 Merge pull request #10492 from Miauw62/recorders
fixes tape recorder spans.
2015-07-10 22:57:42 +02:00
phil235
7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay.
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
2015-07-10 22:29:06 +02:00
xxalpha
4b5659cbf2 what the fuck was I thinking with this one
Negative layers
2015-07-10 19:58:50 +01:00
xxalpha
1746e86ed8 Merge remote-tracking branch 'upstream/master' into smoothballs 2015-07-10 19:19:43 +01:00
Remie Richards
f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
duncathan
5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
phil235
53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
phil235
d4cdd8eaa1 iron foam is now blue steel color just like aluminium foam.
Fixes metal foam from backpack firefighter watertank.
Fixes nanofrost not freezing shut vent scrubbers.
Atmos backpack watertank now starts full of water.
Change foam layer to Objlayer +0.1 so that it is above foammetalstructure so it doesn't hide the dissolving animation and also above tables.
Buff foam and smoke: smoke/foam contains four times the amount of reagents that was inserted in them, for balancing.
Add a little more smoke clouds for tear gas grenade.
Removed the no longer needed max_lifetime smoke var.
Reagent_dispensers (watertank) now show how much reagents they have left upon examination.
Fixed some code formatting in reagent_dispensers.
Fixes nanofrost temperature lowering effect that wasn't working.
Adjusted reagent volume in blob spore smoke because of the buff.
Change to sorium and ldm: effect varies with created volume.
If you are close to a powerful vortex you are thrown, otherwise you are just moved instead.
Vortex blobs now only make you step if you are far from it when reaction hits, otherwise it throws you. The vortex blob range gets +1 to compensate. Also the range and effect depends on the reagent volume which means lower effect for blobspore smoke.
2015-07-09 19:49:06 +02:00
xxalpha
942b4fd790 Fixed false walls incorrect icon update.
Enabled mineral false walls.
2015-07-09 17:17:24 +01:00
Miauw
38d543aee9 fixes tape recorder spans. maybe this wont cause exploits 2015-07-09 17:59:58 +02:00