Commit Graph

281 Commits

Author SHA1 Message Date
Ccomp5950
cb093122d2 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-16 18:11:11 -05:00
Mloc-Argent
e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
2014-05-14 22:42:03 +01:00
Loganbacca
9731082e3e Added a quick adjacent check for alt-clicking
Since we really don't need to be doing a pathing check when we just want to return an object list.
2014-05-14 19:59:40 +12:00
Loganbacca
25983be804 Added exception for breaking full tile windows on top of single pane windows 2014-05-13 23:29:11 +12:00
Mike
cee43ffbf3 Fixes internal storage on ground
Fixes not being able to remove items from internal storage when the
master item is on the ground.
2014-05-10 23:41:48 -04:00
Mike
ba0dded672 Holsters and Unathi knife harness
Also fixed mistyped path and OnClick bug.
2014-04-29 22:43:10 -04:00
Mike
172bda548e Fixed internal storage, added coat pockets
/mob/proc/ClickOn() now checks storage levels, not just contents levels,
now allows items to be taken out of internal storage attached to another
item.
Coats now use internal storage for their pocket slots, removed duplicate
storage code.
Moved coat.dm out of it's special folder and into modules/clothing.
2014-04-29 19:00:36 -04:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
Ccomp5950
e54ce881eb NVG Bugfix
Now they work, and also added a green hud element that tints the screen green when nvg's are worn.
2014-03-23 13:51:57 -05:00
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-25 20:36:46 +00:00
Segrain
c6d39deac0 Fix for #4445. 2014-02-22 06:49:57 +03:00
Segrain
0e2ff8b00b Fix for #4011. 2014-02-02 02:34:30 +03:00
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
2014-01-30 12:14:44 -06:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Ccomp5950
fbcf162416 Sniper Rifle fix.
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.
2014-01-22 22:40:21 -06:00
Giacomand
dfdeed7434 Made the follow verb less buggy.
Removed duplicated code.
2014-01-08 19:14:15 +00:00
Ccomp5950
011c116373 AI / Cyborgs will now leave hiddenprints. 2014-01-03 00:28:54 -06:00
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
Chinsky
a498de8356 Fixes #4075
Cannot turn around while unconscious or dead now.
2013-12-22 08:49:42 +04:00
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
Conflicts:
	html/changelog.html
2013-12-13 19:13:43 +00:00
Chinsky
a9549ac036 Merge pull request #4003 from volas/dev
Custom UI
2013-12-10 10:37:13 -08:00
Ccomp5950
52d328623a Tanks will also keep up with who manipulated them last.
Tanks placed in canisters, scanned with PDA or other analysis tool will set the manipulated_by variable to whoever did so.

The idea is that this person is aware what's in the tank and will act accordingly when you press the internals HUD icon.

If the user was the last person to manipulate the tank (or it's not been manipulated) then the user is smart about selecting the proper tank.

If the user was not the last person to manipulate the tank then he is only checking the pressure gauge to see what tank is fullest that matches his species breath_type

If that tank has nasties in it, welp he is going to get a breathful of nasties.
2013-12-03 23:01:42 -06:00
Ccomp5950
af11500762 Bugfix: Internals HUD click action.
Before:  If you had a tank on your back full of nice precious oxygen, and a tank of plasma in your hand and thought "I'll play it safe and turn on internals" and click the internals icon you would start sucking down plasma like you weren't really qualified to handle such things, how do you even get those two mixed up you big dummy!  Code was hardcoded junk.

After:  A check of what your species prefers to breath, you are an adult, I'm pretty sure you can remember if the tank on your back is oxygen or not, and you will turn on the fullest tank.
Code is now nolonger hardcoded junk, and is expandable by editing a couple of variables instead of hardcoding everything.  Double Rainbow, All The Way Across The Sky!

Also coded in a check for "Carbon Dioxide" in the event a downstream server uses a race that breathes that or we move dionaea to breathing it in the future.
2013-12-03 00:06:08 -06:00
Mloc
fc9dc8243e Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 2013-12-01 21:42:23 +00:00
volas
6841906228 Custom UI 2013-11-30 15:10:42 +04:00
DJSnapshot
00ecbcdcfd fix for https://github.com/Baystation12/Baystation12/issues/3887
Thanks to AquaDraco for the fix
2013-11-29 17:44:31 -08:00
Ccomp5950
3b2767cb35 Hud icons will now also update with their usual icons and states 2013-11-23 04:43:45 -06:00
Ccomp5950
317c562039 Fixed the HUD icons in upper left to show up now.
_onclick changes had removed the proc for this.
2013-11-23 03:26:57 -06:00
DJSnapshot
63fb3f29ea mecha fixes 2013-11-02 12:26:34 -07:00
Chinsky
dcde181bee SOMEONE did not put surgery things on new clickcode, so I done that. 2013-10-16 17:14:09 +04:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00