Commit Graph

3357 Commits

Author SHA1 Message Date
RavingManiac
b26492e66d Simplified the monkey pulling check as per Giacom's suggestion. 2013-12-21 13:51:06 +08:00
RavingManiac
e92bb6a02b Two config variables added - disable_player_mice and uneducated_mice. The first, if enabled, prevents players from spawning as mice, and the second, if enabled, prevents mice from understanding human speech (which they now do my default)
universal_understand = 1 now allows player-controlled mobs to understand what everybody is saying without necessarily allowing them to talk back intelligibly. Mice have universal_understand = 1 by default.
2013-12-18 16:56:49 +08:00
RavingManiac
751219dbfd Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.
Triggered mousetraps and dead mice will be moved back to the top layer.

Monkeys will no longer move randomly while being pulled.
2013-12-18 02:08:38 +08:00
Ccomp5950
0850c30d37 Become Mouse now has a confirmation window.
Squeek!  Now people can quit complaining about hitting it by accident.
2013-12-05 20:29:38 -06:00
Mloc
503302dae5 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Mloc
c5cd3562e3 Merge pull request #3961 from Ccomp5950/loyaltyimplant_fix
Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
2013-11-23 04:02:40 -08:00
Zuhayr
471c45471e Fixes #3927 2013-11-23 21:08:52 +10:30
Ccomp5950
e00c6ae21e Bugfix: is_loyalty_implanted() now checks to make sure the implant is actually implanted and now in your hand.
implant adding via the traitor panel will also update it's location to be in the players head for autopsy as well as is_loyalty_implanted() reasons.

Thanks Chinsky / alex-gh for the heads up on this.
2013-11-22 12:52:25 -06:00
Ccomp5950
9ddbc905e9 Bugfix(2126) Traitors still have loyalty implants, admins should be able to remove/disable implants
Added a proc is_loyalty_implanted() that returns 1 if so, and 0 if not.

Added the ability to remove and add loyalty implants from the traitor panel.

Changed the checks on antags to not care if they are section heads, but to instead check for a loyalty implant.

Fixed a minor bug where traitorborgs made through traitor panel was not adding law 0

Adding a loyalty implant to an antagonist through traitor panel will also remove them from being an antag.
2013-11-22 01:12:56 -06:00
Ccomp5950
734d89c669 BugFix: Cult Ghosts...after a bit of professional advise from chinsky.
Problem:  Cult members can't use the rune to see ghosts, then beat ghosts over the head.  it was being intercepted by _onclick and processed there and only displaying an angry red notice
that you hit that ghost.  Ghost didn't become visible, it disappeared soon after moving off the rune.

Solution:  Made an attackby for ghosts to check when they are being beat up by cultist with books, now they appear.

Minor feature change:  Now if a visible ghost gets hit it will give a different message than the standard "Ghost is pulled through from the other side".
2013-11-15 01:00:25 -06:00
Chinsky
e513b6943e Forgot to remove lying icons / need for them for monkeys. Ook. 2013-11-06 23:54:13 +04:00
Chinsky
ba63c5a1bc Removed overlays_lying.
Now all that shit is done by fancy transformations, client-side.
2013-11-06 22:45:32 +04:00
Chinsky
65c248cda0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma 2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f Cleaned the fuck out of smoke. 2013-11-05 02:57:23 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Chinsky
6a235716f8 Merge branch 'master' into dev 2013-11-04 05:38:46 +04:00
Mloc
73e6311612 Merge pull request #3859 from comma/dev
Made robolimbs into overlays instead of grayscaling limb icon.
2013-11-02 12:54:57 -07:00
Chinsky
d779253ba1 Made robolimbs into overlays instead of grayscaling limb icon. 2013-11-02 23:53:23 +04:00
DJSnapshot
63fb3f29ea mecha fixes 2013-11-02 12:26:34 -07:00
Kilakk
9b540474f3 Changed the embed check to use its own var instead of checking damagetype
* var/embed = 0
* The bullets the detective's revoler uses (weakbullet) will no longer embed into anything.
2013-10-31 22:05:58 -04:00
Nanai
81632df611 Paincrit rebalance. Adjusted all of the damage types, particularly burn, to more reasonable levels while buffing halloss. Made paincrit incredibly less blackscreen and replaced it with weaken procs in order to make it a bit more roleplay friendly. Increased shock levels will now also affect your aim. 2013-10-30 17:12:42 -04:00
DJSnapshot
f020959710 Merge pull request #3833 from Nanai/dev
Cyborg Alt Titles
2013-10-27 17:34:35 -07:00
Nanai
87ac3c28f0 Added "Android" and "Robot" alt titles to cyborgs- They spawn with posibrains. Robot alt title waiting on an alt MMI/brain type from Ravensdale, but functions with posibrain right now. 2013-10-27 20:23:01 -04:00
Kilakk
aee7286e6f Merge remote-tracking branch 'upstream/master' into dev 2013-10-27 00:43:57 -04:00
Segrain
d8f0c43be1 Merge remote-tracking branch 'upstream/master' into dev-freeze 2013-10-24 19:02:56 +03:00
Segrain
5698addc75 Code cleanup. 2013-10-24 09:54:15 +03:00
Chinsky
74f898a1a2 Merge pull request #3809 from DJSnapshot/antag
Fix for sunglasses and Night Vision Goggles
2013-10-23 21:58:44 -07:00
DJSnapshot
5f7ee54430 Fix for sunglasses and night vision goggles 2013-10-23 19:51:01 -07:00
Segrain
6655ae9b11 Wallets and cards. 2013-10-21 05:10:33 +03:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
1d1d611087 Quillsfix. 2013-10-17 03:51:56 +03:00
Chinsky
41377d4122 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-10-15 10:59:06 +04:00
Chinsky
7c681b2bd8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	code/modules/mob/new_player/new_player.dm
2013-10-15 10:56:50 +04:00
Michael Johnson
e285ffd698 Fixed respawn timer issues 2013-10-13 10:35:15 -04:00
Segrain
bcba722bbd Fix for #3763. 2013-10-13 03:44:17 +03:00
Segrain
f725215857 Missing verbs. 2013-10-13 03:43:06 +03:00
Chinsky
fb0fb4da6a Merge pull request #3759 from Baystation12/dev-freeze
freeze -> dev
2013-10-11 11:41:06 -07:00
jack-fractal
6ecab0bc36 - implementing Mloc's suggestions.
- fixing the changelog
2013-10-11 13:29:33 -04:00
jack-fractal
32c3f27675 * adding a 'rejuvinate' function to organs that fixes all types of damage
* adding a 'restore_all_organs' function to living creatures
* adding a 'restore_blood_loss' function to humans
* fixing changeling stasis power to heal organ and blood damage
* fixing adming rejuvinate verb to fix organ and blood damage
2013-10-11 12:39:54 -04:00
Segrain
eb9a337d07 Merge remote-tracking branch 'upstream/master' into dev 2013-10-11 12:44:44 +03:00
Segrain
367c1cf4f4 Better check. 2013-10-11 11:10:27 +03:00
Segrain
775d723f68 Typecheck. 2013-10-11 10:21:14 +03:00
Segrain
17f38e109d Missing language. 2013-10-11 10:16:46 +03:00
Segrain
a4793fd208 Typo fix. 2013-10-11 10:08:04 +03:00
Mloc
3821fb2ab3 Merge pull request #3745 from comma/ghosts
Fancy ghosts!
2013-10-10 03:06:40 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 22:01:16 +01: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
Chinsky
463adc446f Fancy ghosts!
Now ghost will look like char preview / mob at moment of death.
Even MMIs have goasts now.
2013-10-06 16:10:47 +04:00
Chinsky
9000854ddc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into viro 2013-10-06 14:10:20 +04:00
Mloc
c79f33b932 Merge pull request #3732 from comma/sideeffects
Side Effects Strike Back
2013-10-06 03:09:29 -07:00