d9ee81bb96
Merge pull request #4815 from phil235/AudibleMsgFix
...
Simplifying audible messages
2014-09-27 15:01:56 +02:00
1840d72ae4
reverting to show_message proc in three places.
2014-09-25 19:14:51 +02:00
3248e23887
Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
...
Conflicts:
code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
7afbd3345b
Replacing some hearers(...) with get_hearers_in_view(...).
...
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
2014-09-25 18:22:27 +02:00
796e540dfc
Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker
...
Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
2014-09-25 09:37:54 -06:00
c4efa0f773
Downgraded ammunition locker to a regular closet
...
The armory doesn't need two secure lockers, and certainly not one just to hold beanbag shells.
2014-09-21 22:02:35 -06:00
40e0a52283
Repaths clown ore to bananium
2014-09-19 21:26:50 +10: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
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
6c7af5eb32
SPANCLASSES!!!!!
2014-08-26 09:52:13 +02:00
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
dbb7fd9ffe
Locker should be open for cutting apart
2014-08-19 13:56:27 +04:00
c8bd6af8bf
Merge pull request #4480 from Incoming5643/statuefix
...
fixes #4479
2014-08-19 10:20:56 +01:00
68bcb4dbbd
fixes #4479
2014-08-17 23:55:26 -04:00
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
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
74c22755be
Merge pull request #4365 from paprka/fingerlessgloves
...
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01:00
48976301c4
Welders won't weld if they're off. Welders won't finish welding if Toggle Open was used in the process.
2014-08-14 02:11:39 +04:00
53d9aca271
Merge pull request #4371 from paprka/bowmanheadsets
...
Bowman radio headsets
2014-08-11 14:13:26 +01:00
e901f9b6c1
bowmans
2014-08-07 12:30:14 -07:00
3b00fa9cfa
cargonia strong!
2014-08-07 05:51:27 -07:00
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
eea9ae50ad
merging
2014-07-29 16:50:21 -07:00
d992c907c6
goodbye rigsuits my old friends
2014-07-29 11:43:34 -07:00
fdadd6ad86
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-16 00:45:38 +01:00
d34f9fd02e
Merge pull request #3946 from RemieRichards/16/06/2014-AirlockWelding
...
Airlocks and Lockers take time to weld and unweld
2014-07-01 23:22:51 -05:00
96354bb56d
Lockers now take 40 ticks to weld + Sounds + Feedback messages
...
Minor reformat of code for Locker welding
2014-06-19 16:13:10 +01:00
a8b7588c12
Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
...
Conflicts:
code/game/objects/items/weapons/grenades/ghettobomb.dm
code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
df285ff7b3
Resolved conflicts:
...
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
9c6ac5c5f7
Merge pull request #3818 from phil235/ChameleonMimeFix
...
FIx issue #3692
2014-06-12 10:34:41 +01:00
3908160998
One big update for stacks.
2014-06-10 20:36:08 +04:00
b1f050e63a
Adding fingerprints to actions:
...
-breaking windoors
-wrenching/unwrenching pipe dispensers
-locking/unlocking crates
-breaking grilles
-smashing windows
-deconning walls
2014-06-04 22:30:46 -06:00
2ebf4f57e5
under/det into under/rank/det
2014-05-31 00:38:53 +02:00
82b861702f
Resolved Conflicts:
...
code/modules/mob/living/simple_animal/constructs.dm
2014-05-25 10:59:08 -06:00
36bb032957
Merge pull request #3509 from Cheridan/MeteorsSuck
...
Meteor Stuff
2014-05-17 18:42:16 -05:00
8c1e1e1423
Resolved stupid map conflicts
2014-05-15 09:12:47 -06:00
3a0bd3de28
Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
...
Conflicts:
code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
e13ab9422d
Merge pull request #3610 from Aranclanos/washingmachine
...
Washing machine fixes
2014-05-13 16:55:26 +01:00
61b156a07f
Added attack cooldowns to a few objects
...
Includes:
-Fire axe cabinets
-Captain's display case
-RD's lab cage
2014-05-10 12:10:41 -06:00
fd4a0c86eb
-Added an auxiliary storage compartment in SSUs to store one item
...
-Moved CE's magboots and captain's jetpack into them
-Updated it so that any mob can be placed inside the SSU now. Including Corgis.
2014-05-08 22:53:10 -06:00
b215db8b76
Suit Storage Units
...
-Added them around the station, replacing the ones that were just on racks (e.g. Engineering hardsuits, Captain's, etc)
-Removed their object verb. You can now just click drag yourself to climb in
-They now use the new fancy window colors
-Updated Minisat Maint a little bit to give the wall a bit more width around the SMES units. Shouldn't be so much of a vulnerability any more
2014-05-06 22:18:30 -06:00
9ae36480b2
Merge pull request #3618 from kyrahabattoir/ItemNameFixingRound4
...
More name fixing, lowercasing objects, proper-ing unique objects, plural...
2014-05-05 11:46:35 -05:00
997e1310c5
More name fixing, lowercasing objects, proper-ing unique objects, plural-ing some stuff that needs it.
2014-05-01 23:07:35 +02:00
b544a945a9
Fixes issue #2489
...
Fixes issue #119
Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
4d8160ab14
meteorhit() is kill
2014-04-22 12:16:02 -05:00
80e7d1d0e7
Added a check for "_nodrop_" items for several machines/structures ( fix #3407 ).
2014-04-20 20:49:32 +02:00
b800d97e3c
Changed execution chamber access to access_hos, removed bolt controls
2014-04-13 13:51:30 -06:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
Swag McYolosteinen
phil235
ikarrus
Jordie0608
Firecage
Lo6a4evskiy
Alex
Incoming
paprka
Aranclanos
Robson Richards
Cheridan
Kelenius
phil235
fleure
Kyrah Abattoir
Menshin