Commit Graph

550 Commits

Author SHA1 Message Date
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
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
Lo6a4evskiy
6b628667ed Accidentally left unnecessary comment 2014-08-14 13:36:00 +04:00
Lo6a4evskiy
b76595d03e Broken grilles won't summon new rods when hit 2014-08-14 13:33:10 +04:00
Lo6a4evskiy
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
Alex
53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets
Bowman radio headsets
2014-08-11 14:13:26 +01:00
ikarrus
49dc1608d0 -Burglar alarm is now an area/proc
-Burglar alarm automatically clears after a minute
-Fixed runtime with cyborgs receiving burglar alarms
2014-08-09 17:09:35 -06:00
ikarrus
31ad2bc636 Burglar Alarm for Captain's Display Case
-Breaking the Captain's Display Case will now trigger an alarm, bolting all airlocks in the room as well as notifying the AI (after a 3 second delay)

Nowadays, I'm seeing far too many Captains breaking their display case with little repercussion. Keeping the gun in the case used to have value when the AI was able to watch over it (hear people breaking it), but since the AI was moved there's no value in keeping it in there besides to avoid being accused of powergaming.

This change is meant to add incentive for Captains to keep it in the case (Extra Security), humiliates them from taking it (bells and whistles will draw everyone's attention), and makes the steal objective a little more unique from the other ones.

Traitors would need to create their own escape route first, or be extremely predictable jump down the disposal outlet. An alternative to bolting the airlocks (should it be seen as being too extreme) would be to simply drop firedoors instead.
2014-08-09 12:51:11 -06:00
paprka
e901f9b6c1 bowmans 2014-08-07 12:30:14 -07:00
paprka
3b00fa9cfa cargonia strong! 2014-08-07 05:51:27 -07:00
paprka
10f6ca8c7e removes swat helmet 2014-08-07 04:47:55 -07:00
paprka
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
Aranclanos
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
paprka
eea9ae50ad merging 2014-07-29 16:50:21 -07:00
paprka
d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -07:00
paprka
056289a273 fixed moving between adjacent tables 2014-07-29 09:12:01 -07:00
Firecage
2df25335e2 You cannot instant wrench dislodged girders. 2014-07-26 23:25:01 +02:00
Alex
e4de28b13e Merge pull request #4170 from RemieRichards/FixDoorLockerWeld
Fixes Permanent Airlock welding, adds sound to dismantling a locker
2014-07-22 15:18:32 +01:00
paprka
9747d26081 you no longer kick grilles 2014-07-20 22:58:48 -07:00
Robson Richards
fdadd6ad86 Fixes Permanent Airlock welding, adds sound to dismantling a locker 2014-07-16 00:45:38 +01:00
Alex
8e883deff7 Merge pull request #4057 from Aranclanos/OfficeChairs
Rolling chairs fixes.
2014-07-07 10:27:03 +01:00
Aranclanos
5c03b51879 Office/rolling chairs will now work properly when carrying mobs, those will not slip out of the chair, becoming an ungrabless mobs. And the direction of the chair and mob will be better and easier to notice when they bump something.
Their direction changes will work even better if mob movement code finally removes all the spawn() calls. I'm not planning of adding any special code for that here.
2014-07-04 04:46:32 -03:00
Alex
78679366a7 Merge pull request #4030 from Aranclanos/singforthemoment
fixes issue #4025 - service borg violin not working
2014-07-03 13:43:20 +01:00
Cheridan
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
Aranclanos
e47095d376 fixes issue #4025
the song datum will now use properly the canUseTopic() proc
2014-07-01 00:00:40 -03:00
Robson Richards
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
Kelenius
cd4be00d3b Fix 2014-06-19 02:48:37 +04:00
Kelenius
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
Alex
8171c40300 Merge pull request #3915 from phil235/AirlockAssemblyF
Fix for #3871
2014-06-16 10:38:12 +01:00
phil235
6d1bfb9244 removing !src checks 2014-06-13 19:38:15 +02:00
ikarrus
df285ff7b3 Resolved conflicts:
code/modules/mob/mob.dm
2014-06-13 09:04:30 -06:00
phil235
2f03f0fabd Door Assembly exploit fix 2014-06-12 23:06:42 +02:00