d53e8f6a52
Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque
...
Conflicts:
code/game/objects/structures/grille.dm
2014-09-18 19:16:28 +10:00
dff5ed3683
Merge branch 'master' of https://github.com/tgstation/-tg-station into quija
...
Conflicts:
tgstation.dme
2014-09-17 18:24:08 -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
4fc4037939
Prevent displaced girders from being secured or build on if on a forbidden turf (space, shuttle, ...)
...
Fixes #4436 (at least partially)
2014-09-16 23:47:26 +02:00
adbb99a818
make prok gud
2014-09-16 11:33:57 -07: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
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
6e9eed33f7
Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque
2014-09-16 12:50:12 +10: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
73c5ef4459
== > !=
2014-09-15 20:37:21 +10:00
26a7aa1ec3
Updates grille damages
2014-09-15 20:12:14 +10: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
87d7c9e91e
Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)"
...
fixing typos and missing emotes in emote lists.
2014-09-14 01:15:15 +02: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
042615709d
New path for energy swords, /obj/item/weapon/melee/energy/sword/saber and the different type of colours (purple, red, green, blue) are childrens of it.
...
You can only use sabers to create a dualsword and to archieve the funky colours with the multitool.
Dualswords now will be eqipped on hand once created instead of staying on the floor.
Fixes issue #4050
2014-09-12 20:25:40 -03:00
d88cc00a2f
Fixing some message and sound.
2014-09-13 00:46:57 +02:00
6b574ce07c
Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades.
2014-09-12 06:44:25 -03:00
3f7fb4870e
renamed proc
2014-09-09 15:51:00 -07:00
92baf35204
muh whitespace
2014-09-09 15:35:48 -07:00
8d898c5757
climbing onto tables
2014-09-09 15:32:35 -07: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
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
2cf129759b
Showers wet the floor.
2014-09-07 00:11:04 +03: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
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
82f869c9a6
Updated to resolve conflicts
2014-09-06 13:34:43 +04:00
fa51c73548
Adds logging, fixes typo
2014-09-04 00:42:06 -05:00
f8399e07ba
Spirit Boards!
2014-08-31 23:58:06 -05:00
c788df4d6e
Merge pull request #4596 from Jordie0608/greenisthecolorofdiseaseandirish
...
[MAP] Fixes #3147 Greens Viro, fixes building glass med airlocks
2014-08-31 12:34:34 +01:00
ac4b0954f0
Merge pull request #4587 from Firecage/showerloggingprints
...
Shower logging and prints
2014-08-31 12:32:31 +01:00
2d3756f509
nest pixel_x adjusted
2014-08-29 10:13:37 -07:00
a23dbe2357
Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
...
Conflicts:
code/game/objects/items/devices/radio/radio.dm
code/game/objects/items/toys.dm
code/game/objects/items/weapons/tanks/tank_types.dm
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/events/ninja.dm
code/modules/power/cell.dm
code/modules/power/port_gen.dm
code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
492a043f47
fixed reinforced tables
...
Fixes not being able to place wrenches on (unweakened) reinforced
tables. The return statement in the conditional for the wrench in
attackby was preventing control from reaching the conditional later on
that places the wrench on the table. The conditional for the wrench now
checks if it can destroy the table, and if not it continues down to
where it is then placed on the table. table_destroy is now guaranteed to
destroy the table. Also removed the now redundant check in table_destroy
and made it more portable between different kinds of tables. Also fixed
an obvious typo.
2014-08-28 20:02:55 +03:00
4d14bd2dc6
Greens Viro, fixes building glass med airlocks
2014-08-28 23:00:21 +10:00
f20c97b59e
Updates to shower
2014-08-28 12:02:36 +02:00
c9d13e7aa7
no more hideous smoothtable shit
2014-08-27 18:32:28 -07:00
ca77a4e31d
more icons for stuff, nightvision for aliens with hud icon button and toggle verb
2014-08-27 15:16:28 -07:00
465f23e184
The shower will now both log it and add hidden fingerprints when you wrench it to change the temperature.
2014-08-27 16:37:39 +02:00
0198ec2bde
Merge pull request #4576 from Firecage/SPANCLASSES
...
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
93e5918abc
Merge pull request #4381 from Ikarrus/burglaralarm
...
Burglar Alarm for Captain's Display Case
2014-08-26 19:36:04 +02:00
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
Jordie0608
Cheridan
Menshin
Hornygranny
Daniel
phil235
Firecage
Aranclanos
Alex
Perakp
ikarrus
Lo6a4evskiy
MrPerson
Joonatan O'Rourke
Swag McYolosteinen