adrix89
23ba2a310a
Merged duplicates
2014-02-06 09:07:43 +02:00
adrix89
1e9a85b672
Merge branch 'master' of https://github.com/tgstation/-tg-station
...
Merge branch 'master' of https://github.com/tgstation/-tg-station
Spray bottles doesn't make floor wet anymore.
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.
Soap cleaning and uses.
Reworked spray
Revert soap uses, if there are not easily accessible,they are fine.
Revert fixes
2014-02-04 20:00:57 +02: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
Hornygranny
7318aaeeae
ORIGINAL CHARACTER DO NOT STEAL
2014-02-02 18:10:46 -08:00
Cheridan
8762187a59
Merge pull request #2562 from MrPerson/only_the_dead_know_peace_from_this_evil
...
Dead people no longer turn to face things when they examine.
2014-02-02 16:39:50 -08:00
Cheridan
5b5d7eecb9
Merge pull request #2592 from Tenebrosity/git_gud_shoes
...
Fixes grammar of examine messages for objects that are pairs
2014-02-02 16:36:57 -08:00
Cheridan
07e33da535
Merge pull request #2588 from Tenebrosity/windoor_consistent_attack_messages
...
Standardises windoor attackby and hitby messages
2014-02-02 16:19:54 -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
e60ecbb1f4
Merge pull request #2590 from GarrusVakarian/issue#2436fix
...
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 16:08:45 -08:00
MrPerson
4ffd2cf5a4
Allow anyone whose living to turn on examine.
2014-02-02 15:07:09 -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
Cheridan
60576bc1a2
Merge pull request #2551 from Boggart/turretfix
...
Fixes turret construction
turrets are the worst. i mean, jeez.
2014-02-02 10:08:59 -08:00
Tenebrosity
6ae7051977
Removes an if check based on Pete's suggestion
...
Thanks
2014-02-03 06:18:34 +13:00
GarrusVakarian
94bbf55ce3
Adapted code to Jordie0608's fix
2014-02-02 18:01:46 +01: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
Cheridan
8fa0db4c23
Merge pull request #2581 from Razharas/AutolatheFix
...
Fixes autolathe and sheets
2014-02-02 00:50:05 -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
30c4694487
Adapted to fit programming standard
2014-02-02 05:22:39 +01:00
GarrusVakarian
f47ea4fb7b
Adapted to programming standard
2014-02-02 04:57:57 +01:00
Tenebrosity
f3da1a0904
Fixes examine message for pair objects
...
Before:
This is some brown shoes. It is a normal-sized item.
After:
These are some brown shoes. They are a normal-sized item.
2014-02-02 15:49:20 +13:00
Cheridan
417ccb38ea
Merge pull request #2574 from Miauw62/armbladefixes
...
Arm blade bugfixes
2014-02-01 18:28:16 -08: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
Tenebrosity
e1298a4be0
Standardises newscaster attack messages
2014-02-02 15:01:47 +13:00
GarrusVakarian
f71ffde259
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 02:05:15 +01:00
Aranclanos
17d466199c
fixes issue 2587
2014-02-01 22:03:41 -03:00
Tenebrosity
43d0cfe73d
Windoor attackby and hitby message consistency
...
Changes both messages to be consistent with windows and grilles, and
removes their distracting boldness.
2014-02-02 13:00:07 +13:00
Cheridan
636bc7f64c
Merge pull request #2567 from metaglog/door_idpulse
...
Pulsing the ID wire of opened airlocks no longer triggers the deny animation
2014-02-01 15:29:24 -08: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
Boggart
192597daef
Removed some unneccesary whitespace.
2014-02-01 13:05:23 -07:00
Hornygranny
ec7eb2f550
Fedora message uses visible_message
...
Sprites from Nienhaus
2014-02-01 02:22:40 -08:00
Razharas
b02fb6d143
Fixes autolathe and sheets
...
Fixes #2579
2014-02-01 13:30:04 +04: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
Miauw
ad13fc3510
Arm blades are no longer telekinetic table-breakers. Fixes an arm blade typo. Fixed #2559
...
Arm blades no longer delete stuff. Fixed #2570
2014-01-31 18:07:48 +01: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
metaglog
08277fe851
Prevents the airlock deny animation when the airlock is open (eg. when pulsing
...
the ID wire of an emagged airlock).
2014-01-31 06:55:27 +01:00
fleure
acf5bccfa6
Merge pull request #2561 from Razharas/LingFix
...
Fixes ling dna handling and tiny dna scanner fix
2014-01-30 15:41:23 -08:00
