Commit Graph

3386 Commits

Author SHA1 Message Date
Cheridan
b9f67a8334 Merge pull request #10668 from phil235/CyborgFlashFix
Fixes drone and cyborg not being affected by mounted flashers.
2015-07-20 11:53:03 -05:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05:00
WJohn
001dd150e0 Merge pull request #10655 from MMMiracles/TWANG
Adds a 'TWANG' sound effect for guitars
2015-07-19 13:34:40 -04:00
Swag McYolosteinen
a2f338cabf Merge pull request #10343 from GunHog/Borgie_Lights
[Review] Cyborg headlamps!
2015-07-19 19:26:09 +02:00
Swag McYolosteinen
0f244730bc Merge pull request #10626 from Ikarrus/lizardmov
AI Module Updates
2015-07-19 18:06:06 +02:00
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
phil235
e2d76a0116 Fixes drone and cyborg not being affected by mounted flashers.
Remove eye stat damage from flashbang's bang() proc (eye damage is already handled in carbon/flash_eyes())
Changed many flash producing effect to affect all carbons instead of only humans.
The experimental weldingtool now produces less light than regular welding tool and can be used safely with only sunglasses.
2015-07-17 17:12:16 +02:00
Ikarrus
bcbd4da656 Merge branch 'master' of https://github.com/tgstation/-tg-station into lizardmov
Resolved Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
2015-07-16 20:10:20 -06: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
MMMiracles
ca419e47c6 adds a 'TWANG' sound effect for guitars when hitting something 2015-07-16 07:59:10 -04:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +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
Ikarrus
d1175653dd - Reverts Map and Lizardmov changes
- Asimov's subject can now be modified from "human beings"
- You can examine AI modules to check their laws
2015-07-15 08:36:32 -06:00
Ikarrus
c713797566 Makes it easier to check freeform boards by adding a cancel button to inputs. 2015-07-14 23:12:40 -06:00
Ikarrus
ef548f6f67 Adds Lizardmov AI Module 2015-07-14 22:35:05 -06:00
phil235
de288d013e Merge pull request #10591 from bustygoku/Under-Pressure
Tanks Show Pressure When Examined
2015-07-14 15:51:47 +02: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
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02: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
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
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
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
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
Remie Richards
f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01: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
Miauw
38d543aee9 fixes tape recorder spans. maybe this wont cause exploits 2015-07-09 17:59:58 +02:00
Ikarrus
db7cb79509 Resolved Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-09 08:51:39 -06:00
Jordie
4928617c2b Merge pull request #10334 from xxalpha/jetbutt
Added ability for items inside items to have action buttons.
2015-07-09 20:51:29 +10:00
Jordie
1714a8ee10 Merge pull request #10447 from xxalpha/plasmafix
Fixed plasma not stacking.
2015-07-09 20:45:21 +10:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
Ikarrus
b7df175981 Update 2015-07-08 21:31:23 -06:00