Commit Graph

4276 Commits

Author SHA1 Message Date
fleure
43db629b4d Merge pull request #2599 from Ergovisavi/mobs_hate_mechs
Fixes issue #555
2014-02-03 13:41:28 -08:00
fleure
0d68be7931 Merge pull request #2564 from Tenebrosity/fallsounds
Fixes thuds in space and code for hats falling off
2014-02-03 10:41:59 -08:00
fleure
a854a41994 Merge pull request #2540 from Incoming5643/blobjob
BE_BLOB and easy adminblobing
2014-02-03 10:34:31 -08:00
Cheridan
ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Cheridan
d7f6afc8d2 Merge pull request #2600 from Aranclanos/PAdel
fixes issue #2238
2014-02-02 22:34:41 -08:00
Cheridan
04c1af2c16 Merge pull request #2577 from hornygranny/mobster
Mobster items + shirt
he paid me off with a bugfix forgive me
2014-02-02 21:45:42 -08:00
Ergovisavi
9288ca9d69 Fixes issue 555 by making hostile mobs run CanAttack() on the occupant of mechs
Fixes Walking Shrooms not having full health when spawned due to the way their health is randomized on New()
Removes unncessary logging in friendly gold slime reactions, hostile ones retain logging.
Adds asteroid mobs, mushrooms, and holocarp to the blocked list for gold slime reactions.
2014-02-02 18:52:36 -08:00
Hornygranny
7318aaeeae ORIGINAL CHARACTER DO NOT STEAL 2014-02-02 18:10:46 -08:00
Cheridan
b9f47fd412 Merge pull request #2573 from Giacom/MiniStation
Updated the MiniStation map with some minor tweaks.
2014-02-02 16:13:44 -08:00
Cheridan
edc38ce181 Merge pull request #2586 from GarrusVakarian/issue#2454fix
Fixed issue #2454 (Ian loving people while dead)
do note however, that Ian still loves you very much
2014-02-02 13:04:07 -08:00
Cheridan
ff9d551eae Merge pull request #2584 from Petethegoat/oops
No more huge armbands. Fixes #2566.
2014-02-02 11:58:03 -08:00
fleure
68abd1f0e4 Merge pull request #2510 from Tenebrosity/throwsounds
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
fleure
153aae94e2 Merge pull request #2481 from Tenebrosity/projectileimpactnoises
Adds generic impact noises to all projectiles
2014-02-02 04:24:46 -08:00
Aranclanos
68fd365ae8 fixing the Del() of the control panel of the PA 2014-02-02 05:26:05 -03:00
Aranclanos
976e3457b4 added Del() calls for the PA structures/machines 2014-02-02 05:02:09 -03:00
Cheridan
00d85c344d Merge pull request #2547 from Ergovisavi/mushroom_hunter
Walking Mushrooms will now hunt and eat eachother
hydroponics best department
2014-02-01 21:14:28 -08:00
GarrusVakarian
f47ea4fb7b Adapted to programming standard 2014-02-02 04:57:57 +01:00
Cheridan
1d54687b2b Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds
Attack sounds for all melee weapons
2014-02-01 18:01:59 -08:00
Aranclanos
17d466199c fixes issue 2587 2014-02-01 22:03:41 -03:00
GarrusVakarian
b274311f02 First commit! Fixed issue #2454 (Ian loving people while dead) 2014-02-02 00:10:03 +01:00
Pete Goodfellow
473505a6f0 Fixes #2566. 2014-02-01 22:04:22 +00:00
Hornygranny
0bc85a4f9e removed \improper from tommy gun 2014-02-01 13:55:46 -08:00
Hornygranny
ec7eb2f550 Fedora message uses visible_message
Sprites from Nienhaus
2014-02-01 02:22:40 -08:00
Ergovisavi
f52bbaa2b3 Walking mushrooms will inherit some of the original properties of the food item that they were spawned from.
Walking shrooms with ckeys will not gain levels, unlike wild ones, to keep things from getting silly.
2014-01-31 19:09:22 -08:00
hornygranny
3e07065631 mag name fixed 2014-01-31 16:22:49 -08:00
hornygranny
e133206824 one character pr 2014-01-31 16:16:41 -08:00
hornygranny
c569654ebc Mobster items + shirt 2014-01-31 15:50:09 -08:00
Cheridan
b68e6c56f5 Merge pull request #2556 from MrPerson/slime_lying
Makes slimes no longer lie down.
2014-01-31 15:46:43 -08:00
fleure
1df33a981a Merge pull request #2555 from MrPerson/whitescreen_on_software_fix
Stops the whitescreen of death some users were having. Also "readds" the red-damage-bloody-screen-so-real.
2014-01-31 14:25:43 -08:00
fleure
97b99e47f6 Merge pull request #2558 from MrPerson/rollerbeds
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-31 14:13:51 -08:00
Giacomand
923f46a3a2 Updated the MiniStation map with some minor tweaks.
Added an overlay for the TEG that will display the status of the pipes.
Updated the generator instructions.
2014-01-31 15:40:07 +00:00
Ergovisavi
6208e6e763 Expanded on walking mushroom fights. Walking mushrooms now all have different colored caps, and you can save them from being eaten by feeding them a mushroom so they can live to fight another day. 2014-01-31 01:20:42 -08:00
Tenebrosity
560c5fc781 Fixes thuds in space and hats falling off
Fixes #2550 by adding a check for space turf at the location of the mob
before playing a bodyfall sound

Fixes #2494 by following Carn's suggestion of determining whether a hat
will fall off based on its head cover and head hide flags.

Thank you @Razharas and @MrPerson for help with bitflags.

Thanks @Supersayu for providing a lot of this code.
2014-01-31 15:17:08 +13:00
Razharas
b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +04:00
fleure
5cfb94722d Merge pull request #2548 from Ergovisavi/gibtonite_admin_spam
Stops admins getting spammed by Gibtonite ore when it's on the mining zlevel
2014-01-30 15:03:03 -08:00
Malkevin
302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
fleure
6d8f911023 Merge pull request #2504 from RobRichards1997/25/01/2014-Magicks-bad
Fixes #2503 - Mechs Vs. Wand of death
2014-01-30 10:43:13 -08:00
fleure
3a0d12838a Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
fleure
bdf57d20a8 Merge pull request #2517 from Jordie0608/worstbuttonever
Removed three useless admin toggle buttons
2014-01-30 10:31:42 -08:00
fleure
74555f6e8d Merge pull request #2546 from Giacom/MiniStation
Ported the MiniStation branch.
2014-01-30 10:24:04 -08:00
fleure
86d064451a Merge pull request #2543 from Petethegoat/whyGOD
Removes unused vars from /obj/item
2014-01-30 08:31:37 -08:00
Incoming
2320db2353 Remove Colons From Premises 2014-01-30 10:50:32 -05:00
MrPerson
86fa35ef09 Add support for non-0 based turns (ie 90 to 180) while retaining correct pixel_y offsets. 2014-01-30 06:37:20 -08:00
MrPerson
b4d2ba33cb Fixes rollerbeds and their offsets so they don't look stupid. 2014-01-30 06:02:46 -08:00
MrPerson
c7d62c7219 Makes slimes no longer lie down. 2014-01-30 01:30:23 -08:00
MrPerson
a147d122bb Stops the whitescreen of death some users were having. Also "readds" the red-damage-bloody-screen-so-real. I'll get a screenshot in a bit.
Source of the bug: I changed the red screen to use BLEND_MULTIPLY. Due to a mistake I made, the white part in the middle was fully opaque, but since it was a multiply blend, that didn't matter. Turns out in software mode, MULTIPLY defaults to OVERLAY or something, so users in software mode were seeing a fully opaque, non-blended white screen rather than a slightly red tint. Nasty.

Also multiply was stupid. The red was barely noticeable in many cases. Against black like space or things you couldn't see, the red literally didn't even display. No idea why I was so insistent on using this.

Solution: Instead I'll use BLEND_ADD which works just fine in software mode. However, ADD can't add blackness, so I have to have a second layer of darkness on the edges. Also I made the red on the so real blood screen brighter and more intense because it looked kind of dumb. This will probably need to be toned down or even reverted but that's ok.
2014-01-29 20:18:48 -08:00
Ergovisavi
bd3c9dea0a Fixes a possible runtime with gibtonite deposits. 2014-01-29 18:10:21 -08:00
Ergovisavi
b7eb807f34 Stops the admins from getting spammed from gibtonite, but is still logged 2014-01-29 15:54:10 -08:00
Ergovisavi
d56f48d241 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 2014-01-29 14:56:06 -08:00
Giacomand
7a76e9456b Ported the MiniStation branch.
MiniStation is now a single folder which isn't included by default. When you tick the code file for the ministation map, like with tgstation and metastation, it will then include the necessary code files itself. These code files modify certain datums, like jobs, supply packs and uplink datums.

The modified files outside the MiniStation folder are modifications made by the MiniStation branch which aren't changes exclusive to MiniStation.

Such as changing the unused circulator, which only MiniStation used, so that it was fixed and would correctly match the direction of the thermal generator.
The TEG was also changed to have a better interface and to include the above fix.
The department security was changed so it wouldn't runtime if it didn't find a checkpoint.
The preferences' SetChoices was changed so that the screen would automatically grow for every column in the job list.

The main difference between this version and the forked version is that the Unemployed and the Lieutenant was reverted back to their original names; since it would've been a massive pain to add support for that.
2014-01-29 22:36:10 +00:00