Commit Graph

580 Commits

Author SHA1 Message Date
Cheridan
40e40af5af Merge pull request #4845 from Menshin/table_crafting_fix
Items table crafting fixing
2014-09-17 13:53:13 -05:00
Cheridan
fabc50fa40 Merge pull request #4857 from Donkie/echair
Removes e-chair toggle verb. Fixes #4853
2014-09-17 10:33:48 -05:00
Cheridan
83390797cb Merge pull request #4844 from phil235/TypoFix
Fixing typos.!
2014-09-17 10:13:21 -05:00
Cheridan
98ca6f551a Merge pull request #4715 from Firecage/STATUESGALORRE
Mineral Statues!
2014-09-16 08:56:40 -05:00
Cheridan
cd990bdeda Merge pull request #4810 from phil235/Messagetypos
Fix many messages and sounds
2014-09-16 08:45:31 -05:00
Daniel
5da8979229 Removed on variable and toggle verb
they be useless
2014-09-16 12:11:42 +02:00
Daniel
c4c4bdf833 Ghosts can't interact with echairs. Fixes #4853 2014-09-16 12:02:59 +02:00
phil235
8672e58e3a Fixing typos. 2014-09-15 19:50:34 +02:00
Menshin
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
Firecage
caa4d60503 Phase Honk 2014-09-15 12:44:52 +02:00
Firecage
16502db223 Merge branch 'master' of https://github.com/tgstation/-tg-station.git into STATUESGALORRE 2014-09-15 11:17:44 +02:00
Firecage
ad5d15a225 New part 2014-09-15 11:16:39 +02:00
phil235
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
phil235
d88cc00a2f Fixing some message and sound. 2014-09-13 00:46:57 +02:00
Aranclanos
6b574ce07c Fixes the dismantling falsewalls with plasmacutters, diamond drills or energy blades. 2014-09-12 06:44:25 -03:00
Hornygranny
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
Alex
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
Firecage
b3c842b614 phase 1 part 3: Anonussing 2014-09-07 00:40:48 +02:00
Firecage
ea900fc0e7 Phase 1 part 2: Improvement to code 2014-09-06 22:46:44 +02:00
Firecage
2bf0773261 First phase of statues part 1 2014-09-06 21:14:27 +02:00
ikarrus
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
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
Alex
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
Alex
ac4b0954f0 Merge pull request #4587 from Firecage/showerloggingprints
Shower logging and prints
2014-08-31 12:32:31 +01:00
Hornygranny
2d3756f509 nest pixel_x adjusted 2014-08-29 10:13:37 -07:00
Joonatan O'Rourke
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
Jordie0608
4d14bd2dc6 Greens Viro, fixes building glass med airlocks 2014-08-28 23:00:21 +10:00
Firecage
f20c97b59e Updates to shower 2014-08-28 12:02:36 +02:00
Hornygranny
c9d13e7aa7 no more hideous smoothtable shit 2014-08-27 18:32:28 -07:00
Hornygranny
ca77a4e31d more icons for stuff, nightvision for aliens with hud icon button and toggle verb 2014-08-27 15:16:28 -07:00
Firecage
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
Cheridan
0198ec2bde Merge pull request #4576 from Firecage/SPANCLASSES
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
Swag McYolosteinen
93e5918abc Merge pull request #4381 from Ikarrus/burglaralarm
Burglar Alarm for Captain's Display Case
2014-08-26 19:36:04 +02:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Alex
f0a8437231 Merge pull request #4457 from Ikarrus/falsewall_cheese
Mobs will block false walls from closing
2014-08-24 13:00:50 +01:00
Swag McYolosteinen
8c910a3b10 Merge pull request #4414 from Lo6a4evskiy/2014-08-14-Welding-lockers
Fixes for welders and lockers
2014-08-19 12:28:58 +02:00
Lo6a4evskiy
dbb7fd9ffe Locker should be open for cutting apart 2014-08-19 13:56:27 +04:00
Alex
c8bd6af8bf Merge pull request #4480 from Incoming5643/statuefix
fixes #4479
2014-08-19 10:20:56 +01:00
ikarrus
0be874efff -Added proc for setting the flashing red alarm lights
-moved all the Related Areas checking for fire alarms into the procs in areas.dm
-Added sound for burglar alarm due to popular request
2014-08-18 21:27:42 -06:00
Incoming
68bcb4dbbd fixes #4479 2014-08-17 23:55:26 -04:00
Aranclanos
b0f0d01d36 Merge pull request #4427 from Cheridan/blow_up
Advanced Shotshells
2014-08-17 15:35:08 -03:00
Lo6a4evskiy
80dea1edb3 Now it only checks if closet is open at the moment of welding. Also removed useless message. 2014-08-17 18:17:48 +04:00
Alex
7413f743c8 Merge pull request #4451 from Firecage/structureabsolutes
absolute paths for the structure folder files
2014-08-17 13:45:13 +01:00
Alex
3fd2886eb0 Merge pull request #4420 from Lo6a4evskiy/2014-08-14-Broken-grilles
Broken grilles will not spawn rods when hit
2014-08-16 13:39:35 +01:00
ikarrus
01fd7a9dd9 Mobs will block false walls from closing
I observed a round where a player cheesed the AI Chamber during Malfunction by closing false walls on himself and using that as a shield against electrodes, lasers, and the cleaner fluid. This is to prevent that.
2014-08-15 20:10:45 -06:00
Firecage
146af7607c absolute paths for the structure folder files
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
2014-08-16 00:01:04 +02:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01:00
Cheridan
148d16397b Advanced Shotshells
adds 3 new types of shotgun ammo. make them by crafting the special shell in RND, and then using table-crafting to make the unique ammo.dmi

meteorshot, made with compressed matter cartridges
pulse slugs, shotgun rounds with the properties of a laser weapon.
dragonsbreath rounds, area-of-effect flame weapons.
renames ammunition/bullets.dm to ammunition/ammo_casings.dm, which is more accurate

splits RND designs up into their own files
2014-08-14 12:15:10 -05:00
Lo6a4evskiy
54c8cc0f66 Some cleanup 2014-08-14 13:56:19 +04:00
Lo6a4evskiy
04ce0616e7 Cannot place one-way glass by clicking on destroyed grille 2014-08-14 13:50:41 +04:00