f5bf1ddaa9
Merge pull request #4809 from RemieRichards/Drones
...
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
40e40af5af
Merge pull request #4845 from Menshin/table_crafting_fix
...
Items table crafting fixing
2014-09-17 13:53:13 -05:00
fabc50fa40
Merge pull request #4857 from Donkie/echair
...
Removes e-chair toggle verb. Fixes #4853
2014-09-17 10:33:48 -05:00
83390797cb
Merge pull request #4844 from phil235/TypoFix
...
Fixing typos.!
2014-09-17 10:13:21 -05:00
de6edfc1c6
Merge pull request #4818 from Incoming5643/summoneventfixerspecial
...
Magic Mania 1.75 Appendix A: lets get comparitively reasonable
2014-09-16 09:09:40 -05:00
98ca6f551a
Merge pull request #4715 from Firecage/STATUESGALORRE
...
Mineral Statues!
2014-09-16 08:56:40 -05:00
cd990bdeda
Merge pull request #4810 from phil235/Messagetypos
...
Fix many messages and sounds
2014-09-16 08:45:31 -05:00
9673532613
Merge pull request #4796 from Perakp/ghostbag
...
Ghosts don't trigger mousetraps.
2014-09-16 12:18:04 +01:00
5da8979229
Removed on variable and toggle verb
...
they be useless
2014-09-16 12:11:42 +02:00
c4c4bdf833
Ghosts can't interact with echairs. Fixes #4853
2014-09-16 12:02:59 +02:00
d3e7e1b73d
Merge pull request #4821 from phil235/FlashbangFix
...
Fix for #3773
2014-09-15 21:27:15 -05:00
071f9bff0a
Fixes up some silly problems with cursed items:
...
Things won't be called cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed cursed foo's anymore
Cursed Katanas can't get stuck in any other slots now
Things that destroy your ability to go into space now won't spawn on you at all if you happen to be in space when the spawning occurers, but hey don't idle in space just to avoid a luchador mask, magicarp are still a thing.
2014-09-15 19:22:25 -04:00
8672e58e3a
Fixing typos.
2014-09-15 19:50:34 +02:00
d519501425
* prevent the same item from being selected multiple times when looking for parts while table crafting ( fixes #4820 )
...
* small typo in construction fixed
2014-09-15 19:20:47 +02:00
caa4d60503
Phase Honk
2014-09-15 12:44:52 +02:00
16502db223
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE
2014-09-15 11:17:44 +02:00
ad5d15a225
New part
2014-09-15 11:16:39 +02:00
f637e6491c
Unconscious don't trigger mousetraps.
2014-09-14 20:49:36 +03:00
e639737605
hearers() -> get_hear() Fixing the issue.
2014-09-14 15:35:23 +02:00
6697b18f7a
Merge pull request #4770 from Donkie/glassfix
...
Fixed welding a shard producing message spam
2014-09-14 13:20:24 +01:00
4d427bf712
Partial fix for the immunity to flashbangs in the dark ( now only immune if in the dark AND inside a locker). Deaf people no longer see the "BANG" message of flashbangs.
2014-09-14 14:19:25 +02:00
37b4c6bdfa
Merge pull request #4793 from Aranclanos/falsewalldismantle
...
Fixes the dismantling falsewalls with plasmacutters, diamond drills and energy blades.
2014-09-14 13:16:16 +01:00
1b0e83e00a
Merge pull request #4786 from Aranclanos/gamemodeunusedvars
...
Removes two unused vars of the gamemode datums.
2014-09-13 19:55:38 +01:00
24686b5248
Fixes many messages/sounds or lack thereof for different mobs.
...
(
Nothing when Attack w/ item on dead animal
No varied attack verb for the above.
Item attack on alive SA/syndicate/melee: no sound
No Punchsound on alive and dead SA.
goat attack on SA/human/alien/monkey : no sound
attack_hand and Item attack on dying mouse: nothing
is_muzzled() fix in slime.dm and humanoid.dm and larva.dm and humanattac?kpaw.dm (put a muzzle on self, immune to monkey bites!)
monkey attack on animal: can't attack alive!
monkey (821) has attacked the grey baby slime (477)! (needs bite and sound)
monkey can't attack_paw alien/slime/animal with health below 0.
attack_animal on larva has no sound.
monkey bite on human: no sound
Larva on Humanoid/slime.
can't monkeybite a wounded alien.
larva needs to be attackable by humanoid/slime/hand/item/monkey/SA
Monkey cant bite dead/unconscious monkey
Larva bite has no sound. can't bite anyone but animals
)
2014-09-13 17:41:47 +02:00
473bcd1858
Ports Drones from NTstation + New Improvements/Features
2014-09-13 15:02:57 +01:00
d88cc00a2f
Fixing some message and sound.
2014-09-13 00:46:57 +02:00
2db366f4c1
Ghosts don't trigger mousetraps.
2014-09-12 15:21:32 +03:00
6b574ce07c
Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades.
2014-09-12 06:44:25 -03:00
e36189772a
fixes resin runtime, weeds and walls update icons properly on destruction
2014-09-11 14:40:35 -07:00
bfd9ce393e
Removes two unused vars of the gamemode datums, uplink_welcome and uplink_uses.
...
uplink_welcome was actually used as a greeting text from uplinks, now they'll always show "Syndicate Uplink Console:". The removed strings weren't nothing important, actually, with the addition of the uplinks in cargo, you were able to metagame the ongoing gamemode.
2014-09-11 06:06:59 -03:00
8348743237
Adds failure message for when you try to rename a endoskeleton with a pen.
2014-09-10 08:09:39 -03:00
d29d3a37da
Fixed welding shard message spam
2014-09-10 11:55:07 +02:00
12a926ae9e
Merge pull request #4532 from hornygranny/smoothaliens
...
alium update
2014-09-09 14:54:43 -05:00
5f33e3d713
old alien sprites, description updates
2014-09-09 11:21:41 -07:00
cb834f6f29
Merge pull request #4746 from kyrahabattoir/goodbyeRussian
...
Because aparently we can't have nice things.
2014-09-09 12:51:20 -05:00
20d9e6c2b2
Because aparently we can't have nice things.
2014-09-08 17:26:28 +02:00
02e527e938
Merge branch 'smoothaliens'
...
Conflicts:
code/_onclick/hud/screen_objects.dm
code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
cd34be6151
Merge pull request #4521 from Incoming5643/summonevents
...
Magic Mania $1.75: Summon events
2014-09-07 22:34:26 -05:00
866dbb7959
Merge pull request #4634 from Carn/timSort
...
TimSort for byond
2014-09-07 19:52:02 -05:00
6bde58d70d
Merge pull request #4702 from Miauw62/sleepen
...
Balance changes to the sleepy pen.
2014-09-07 10:38:00 -05:00
8f81a0e766
Merge pull request #4709 from Lo6a4evskiy/2014-08-15-Welding-stuff
...
Removed unnecessary messages when welding
2014-09-07 15:08:01 +01:00
b3c842b614
phase 1 part 3: Anonussing
2014-09-07 00:40:48 +02:00
ea900fc0e7
Phase 1 part 2: Improvement to code
2014-09-06 22:46:44 +02:00
2bf0773261
First phase of statues part 1
2014-09-06 21:14:27 +02:00
7a9aeaf15f
Merge pull request #4711 from Ikarrus/consistentwelds
...
Consistent welding sounds
2014-09-06 19:08:53 +01:00
368b8b199b
Merge pull request #4682 from Menshin/reagents_consumption_fix
...
Fixes reagents extra consumption + some cleanup
2014-09-06 19:05:42 +01:00
62a7596270
Merge pull request #4686 from Miauw62/idfix
...
Worn ID won't display on station-bounced broadcasts.
2014-09-06 19:04:59 +01:00
93d7aa68c2
Consistent welding sounds
...
Starting a weld job will always play welder.ogg
Finishing a weld job will always play welder2.ogg
Closets and airlocks were backwards.
2014-09-06 10:06:17 -06:00
aab99e8825
Fixes what Miauw said
2014-09-06 15:19:58 +02:00
82f869c9a6
Updated to resolve conflicts
2014-09-06 13:34:43 +04:00
Cheridan
Alex
Daniel
Incoming
phil235
Menshin
Firecage
Perakp
phil235
Remie Richards
Aranclanos
Hornygranny
KyrahAbattoir
ikarrus
Lo6a4evskiy