Commit Graph

912 Commits

Author SHA1 Message Date
Cheridan 3a5cde5988 Merge pull request #10901 from CosmicScientist/mobcostumes
Adds carp and Ian costumes
2015-08-11 18:16:49 -05:00
CosmicScientist 445e8c5657 Update miscellaneous.dm
Adds to the hardsuit description to tell of its melee incapability.
2015-08-08 16:01:39 +01:00
CosmicScientist 2844c80ed5 Fixing merge conflicts 2015-08-08 15:43:38 +01:00
xxalpha 008c70acea Fixed inbuilt jetpacks dropping when suit is deleted. 2015-08-08 04:05:51 +01:00
Cheridan 31fca2d6b8 Merge pull request #10952 from phil235/BartenderSecPhotoFix
Fixes bartender uniform not appearing in security record photo.
2015-08-02 07:20:45 -05:00
Cheridan 7763263cc0 Merge pull request #10940 from Incoming5643/no_glove_no_love
Syndicate toolboxes now come with insulated gloves
2015-08-02 06:35:42 -05:00
phil235 13e561e3e8 Fixes bartender uniform not appearing in security record photo.
Removing bar_suit icon in uniforms.dmi because it's identical to "barman"
Replaced instances of "ba_suit" and "bar_suit" with "barman" (so that the bartender uniform icon names follow the same pattern as other job uniforms ("chef", "captain", "hos", ...)
2015-07-31 16:20:21 +02:00
Incoming e2c39a20f4 RemieRichards wins the technical code semantics fight today 2015-07-30 17:55:35 -04:00
Incoming 248b1f5c96 Syndicate toolboxes now come with insulted gloves (that look like red gloves). Wires are lost as a consequence. 2015-07-30 17:28:11 -04:00
Jordie0608 1132344628 Rice hat by scones 2015-07-30 21:13:43 +10:00
CosmicScientist 2d2e1acf6a Ian costume is now Corgi costume, made from corgi hide, can be put on a corgi to visually hide if they're shaved, get corgi hide from butchering corgis, furismurder 2015-07-28 20:19:26 +01:00
CosmicScientist 26190b90ee Adds carp spacesuit + mask, carp costume and ian costume. 2015-07-28 00:06:32 +01:00
Aranclanos 7e5f3934c7 Merge pull request #10752 from phil235/HailerOverload
Add overload to sec hailer
2015-07-23 13:51:45 -03:00
phil235 3da34d436b Changed hailer overload, it now simply breaks the hailing system. 2015-07-23 15:02:11 +02:00
Jordie b2948fcab7 Merge pull request #10659 from phil235/HandcuffOverlayFix
Handcuff, fire, overlays_standing fixes
2015-07-23 22:21:52 +10:00
phil235 8cfda1f2ba Leather jacket and leather overcoat can now hold the same things as military jacket. 2015-07-23 01:00:41 +02:00
phil235 511a87724b Move sec hailer gas mask into its own file
Adding overload when spamming the sec hailer. Burn damage for the user except if silicon (em pulse instead).
2015-07-21 19:34:04 +02:00
phil235 c900894030 Gives the Military Jacket some suit storage options. It can hold all the minor items that the bomber jacket can, as well as the 10mm pistol, the .357 revolver, and the .38
Made the military jacket into an actual jacket.
2015-07-21 18:12:31 +02:00
phil235 76feff5dfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HandcuffOverlayFix
Conflicts:
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/head/helmet.dm
	code/modules/mob/living/carbon/carbon.dm
2015-07-20 22:37:06 +02:00
Aranclanos b2f9be0e29 Merge pull request #10689 from tgstation/revert-10345-HoSArm
Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing"
2015-07-20 02:09:38 -03:00
WJohn 2d3c289234 Merge pull request #10642 from MMMiracles/flukeops
removes conspiracy theory
2015-07-19 13:31:54 -04:00
Cheridan d39a2ef5db Revert "[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing" 2015-07-18 07:51:17 -05:00
Remie Richards 9394e570ae Merge pull request #10643 from KorPhaeron/soundfix
Fixes sounds cutting out halfway
2015-07-18 00:03:23 +01:00
MMMiracles 4eedf27627 Makes SWAT helmets space-proof again. 2015-07-17 14:59:47 -04:00
phil235 d72cbcaf2f - fixes handcuff overlay on monkey not showing.
- Fixes the lack of handcuff icon on the hand screen object for alien humanoids..
- fix legcuff overlay not showing on monkey.
- fixes fire overlay for monkey, aliens and cyborg, no longer looks human shaped.
- Made the regenerate_icons's subprocs at the carbon level more OOP.
2015-07-17 01:15:21 +02:00
phil235 0f37ac3c14 Merge pull request #10601 from xxalpha/nightmaregoggles
Fixed t-ray goggles not updating pipes&cables correctly.
2015-07-16 19:52:22 +02:00
WJohn 3537d754b3 Merge pull request #10345 from Steelpoint/HoSArm
[BALANCE] HoS/ERT/DS Armour Buff | Revolver Armour Piercing
2015-07-16 11:29:22 -04:00
WJohn a93dde3034 Merge pull request #10384 from Steelpoint/GasMask
[BALANCE] Reduces Weight Size of Sechailer Gas Mask
2015-07-16 11:25:13 -04:00
MMMiracles 867b43a5a3 re-adds the black/red striped variant for fluke ops. also hunke. 2015-07-16 00:48:42 -04:00
KorPhaeron d372bae224 I did it backwards help 2015-07-15 18:03:12 -05:00
KorPhaeron d193fe7bac Changes var name 2015-07-15 18:02:15 -05:00
KorPhaeron 1994070b3b Changes 2015-07-15 17:59:50 -05:00
KorPhaeron 7c5a90c5e9 Fixes sounds cutting out 2015-07-15 17:35:15 -05:00
MMMiracles 7b546709b9 removes any source of connection between nanotrasen and syn- i mean removes possible conspiracy theories caused by stolen nanotrasen equipment. 2015-07-15 18:11:32 -04:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
xxalpha a306520ba9 Fixed t-ray goggles not updating pipes&cables correctly.
Loc <<
2015-07-14 00:45:41 +01:00
Swag McYolosteinen 81ec442d50 Merge pull request #10512 from duncathan/traygoggles
Adds t-ray scanner goggles for atmos techs
2015-07-12 12:41:37 +02:00
duncathan c3b095a8b3 adds scanners to R&D; adds changelog 2015-07-10 23:15:44 -06:00
duncathan 5bfaff9879 adds tray goggles 2015-07-10 03:35:56 -06:00
MrStonedOne 12580ec5da Fixes siren helmet spam
Volume has been greatly reduced, and the cooldown has been raised sightly to give short bursts of silence between sirens.
2015-07-09 12:25:56 -07:00
Steelpoint 1e727e34eb BulTo40 2015-07-05 19:05:09 +08:00
Steelpoint 2780f62ec9 CollapsingIntensifies 2015-07-05 01:23:19 +08:00
Razharas bc2592eb5a Merge pull request #10222 from MMMiracles/freedomsocks
Adds patriotic apparel for upcoming 4th of July (and inferior countries too I guess)
2015-07-04 10:04:46 +03:00
Steelpoint bb88dda82b ERT/DS 2015-07-04 01:38:30 +08:00
Steelpoint a3f5be0b21 HoSArmour 2015-07-03 21:08:21 +08:00
Cheridan 256f0adeb6 Merge pull request #10280 from optimumtact/securitycamerasreduxion
Remove security cameras for real
2015-07-02 22:42:50 -05:00
xxalpha cbf041c054 MATERIAL DATUM 2015-07-01 18:32:30 +01:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
oranges e587e0c077 Remove helmeted mounted cameras from game 2015-06-30 16:08:48 +12:00
Cheridan 87cd31c11f Merge pull request #10211 from Ikarrus/burntweaks
Destructible Clothing Tweaks and Fixes
2015-06-29 21:38:20 -05:00