Hornygranny
1d61d02af7
qdel
2014-08-28 14:24:40 -07:00
Hornygranny
8b19b2bb38
cleanup
2014-08-28 11:50:02 -07:00
Hornygranny
c9d13e7aa7
no more hideous smoothtable shit
2014-08-27 18:32:28 -07:00
Hornygranny
04d7d954d2
awful awful table smoothing pasta replaced with smoothwall modification
2014-08-27 17:16:49 -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
Hornygranny
2602aeebc8
aliums 2spukki
2014-08-22 10:13:18 -07: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
99fae13391
Merge pull request #4393 from paprka/emptyclick
...
Empty gun click noise
2014-08-19 10:36:06 +01:00
Alex
c8bd6af8bf
Merge pull request #4480 from Incoming5643/statuefix
...
fixes #4479
2014-08-19 10:20:56 +01:00
Swag McYolosteinen
5e696e9cd7
Merge pull request #4374 from kyrahabattoir/DynamicMaintenanceLoot
...
Dynamic maintenance loot table and map modification.
2014-08-18 19:27:02 +02:00
Alex
5c5e54342d
Merge pull request #4470 from Ikarrus/gibsounds
...
Added a sound for Gibbing
2014-08-18 08:03:47 +01:00
Incoming
68bcb4dbbd
fixes #4479
2014-08-17 23:55:26 -04:00
KyrahAbattoir
7fb2e5351b
Removed flash from the maintenance loot table.
...
set armory_contraband to not spawn duplicates (as it initially was).
2014-08-18 05:41:52 +02:00
KyrahAbattoir
37f9716fb5
Added loot tables for the maintenance and the contraband locker (removed the map edit for now)
2014-08-18 05:40:15 +02: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
ikarrus
be077176ee
Used the gibspawner instead
2014-08-16 19:17:39 -06: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
MrPerson
09071b88d5
Merge pull request #4357 from paprka/nerfninja
...
Makes ninja less stupidly broken (balancing)
2014-08-16 04:13:49 -07: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
paprka
bbf90b10d3
span fixes
2014-08-12 02:15:07 -07:00
Alex
ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
paprka
e97f21a24a
empty weapon click
2014-08-11 22:56:05 -07:00
Alex
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
Alex
53d9aca271
Merge pull request #4371 from paprka/bowmanheadsets
...
Bowman radio headsets
2014-08-11 14:13:26 +01:00
Swag McYolosteinen
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
paprka
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
ikarrus
8a5d1325d1
Update boxes.dm
2014-08-09 14:23:37 -06:00
ikarrus
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
ikarrus
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
Aranclanos
0a7bd48a7b
Merge pull request #4368 from Firecage/Effectabsoluting
...
Adds absolute paths to some effect files.
2014-08-09 16:33:19 -03:00
paprka
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
Firecage
24b18fad93
Absolute paths for item files.
2014-08-07 23:02:43 +02:00
paprka
e901f9b6c1
bowmans
2014-08-07 12:30:14 -07:00
Firecage
22743b77f4
Adds asbolute paths to some effect files.
2014-08-07 18:59:06 +02: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
paprka
c09d8981fe
makes ninja less stupidly broken
2014-08-06 15:13:06 -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
Aranclanos
0ad9b394d5
Merge pull request #4296 from AndroidSFV/alienwallbuff
...
Resin walls and weeds cannot be mash-attacked.
2014-08-03 21:46:22 -03:00
