Commit Graph

165 Commits

Author SHA1 Message Date
woodratt 47ab279b9b 1.5.5 Fancy Green Uniforms
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
2016-07-12 17:19:39 -07:00
PsiOmegaDelta b277447426 Now possible to tweak colors of loadout items.
Used to greatly cut down on the number of hats (hijabs, kippots, and turbans).
2016-03-30 18:01:09 +01:00
Neerti 015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes
Map fixes, minor edits
2016-03-30 02:25:35 -04:00
Neerti e7c9681c91 Merge pull request #1281 from redstryker/Navy-Blue-Scrubs
Adds Navy Blue scrubs
2016-03-30 02:24:07 -04:00
Mark9013100 a7b6bf1960 Minor improvement to riot helm code 2016-03-29 12:43:07 -04:00
Mark9013100 50a6f53c12 Map fixes, minor edits 2016-03-29 10:50:22 -04:00
redstryker 7a437e12f5 Adds Navy Blue scrubs and a navy blue surgical cap. Also adds them to the loadout and all appropriate lockers. 2016-03-28 23:53:38 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
redstryker 5f7443c063 Adds Turbans and Kippot 2016-03-12 12:34:41 -05:00
Mark9013100 4963d5a858 New combat helmet sprite 2016-03-08 21:37:04 -05:00
Neerti 2420ed3867 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/28/2016_armor 2016-03-06 04:19:33 -05:00
Neerti d4793de3a0 Adds a bunch of stuff for sec armor. See PR for details. 2016-03-06 04:18:39 -05:00
Neerti 6224e978a9 Merge pull request #1014 from Zuhayr/voxremove
Removed the Vox Pox.
2016-03-04 12:32:23 -05:00
redstryker df5e980843 Adds hijabs as a head item and a loadout item. 2016-02-26 16:17:56 -05:00
Zuhayr a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Neerti b7a3a98ef0 Ling nerfs, ear protection cleanup, and ling bugfixes. 2016-02-14 19:58:57 -05:00
Zuhayr 19014807fd Surface rename of Seromi to Teshari. 2016-02-06 12:50:16 +10:30
Zuhayr 58736fb4f6 Renaming Resomi to Seromi. 2016-01-27 14:24:09 +10:30
Zuhayr eef9145486 Revert "Removes Resomi."
This reverts commit c9f579e00a.
2016-01-27 13:48:48 +10:30
Mark9013100 8194c3ca61 Adds action buttons for hard-hats and goggles 2016-01-22 20:27:58 -05:00
Yoshax eda657a272 Adds orange and violet hairflower pins 2016-01-13 19:51:37 +00:00
Mark9013100 cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00
Zuhayr c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
woodratt 8cd20b03f3 1.3.6 - Bug Fixes and Spurs
- Replaced 971 left facing windows with ones without super health.
- Adjusted lights in both the medical and engineering rest rooms.
- Adjusted several intercoms across the station, including the AI core ones.
- Centcomm beach area sounds removed.
- Adjusted maintenance between bridge and kitchen.
- Keycard Identification thing added to HoP office.
- Plastic flaps added to cargo deliveries office.
- Fixed Emitter in Engineering outpost.
- Fixed voided tile on t-comms, fixed the dark tiles.
- Added a mighty fine cowboy hat.
2015-12-19 21:41:35 -08:00
Mark9013100 172ef26cc9 Adds festive santa hats! 2015-12-14 18:32:00 -05:00
Mark9013100 97a52b3815 Replaces the default berets with /tg/'s. 2015-12-01 22:26:30 -05:00
SinTwo 1f42ba7961 BERETS DAMMIT 2015-12-01 20:53:25 -05:00
Mark9013100 880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
Neerti 4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
Mark9013100 9b9bcff9de Brings back the Ausop helmets added in one of my earlier PRs.
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
2015-10-26 21:02:16 -04:00
SinTwo ec58f7c705 TG_Port
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/under/accessories/accessory.dm
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/mask.dmi
	icons/obj/clothing/hats.dmi
	polaris.dme
2015-10-11 00:58:26 -04:00
Neerti 24d9545790 Headset/shield issues. 2015-10-11 00:54:01 -04:00
Mark9013100 080e526e9e Fixes an issue with helmet visors 2015-10-11 00:40:11 -04:00
Mark9013100 fb1134a24b Changes several helmets, fixes shields
Conflicts:
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/weapons/shields.dm
	code/modules/clothing/head/helmet.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-10-11 00:39:38 -04:00
Jon 9f2ec9c163 Adds three new hair flower pins - yellow, blue, and pink.
All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.
2015-10-11 00:26:54 -04:00
PsiOmegaDelta f3175becc0 Overhauls humanoid vision handling.
Clothes now have a flash protection and tint level. If one is wearing multiple items with these modifiers they do stack.
Glasses also have a number of additional additions such as sight flags, see_invis level, and so forth.

Flash protection comes in 4 levels: Reduced, none, moderate, major.
Reduced protection, for example, means the user takes increased damaged from welding.
Moderate protection safeguards mobs from flashes, flash grenades, projectors, etc.
Major protection protects from the above as well as welding.

Tint also comes in 4 levels: None, moderate, heavy, blind
Moderate tint will apply the nearsighted overlay.
Major tint will apply the welding overlay.
Blind will apply the blindness overlay.

The end result is an attempt of less type checking. Any set of glasses may now also contain HUD glasses.
This should make a future rewrite of HUD glasses easier (could have the HUD functionality be a datum rather than separate item).
2015-10-05 08:48:47 +02:00
Neerti a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
2015-09-06 18:26:06 -04:00
Zuhayr a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
2015-08-23 01:30:46 -04:00
Mark9013100 1466752166 Fixes #166 2015-08-21 14:01:05 -04:00
Zuhayr 3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Chinsky 317eaf4771 Merge pull request #10101 from mwerezak/shards
Refactors obj flags and changes defined bitflag representation
2015-08-20 19:47:58 +03:00
mwerezak fd8f6d9639 Removes MASK/HEADCOVERSMOUTH
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
2015-08-18 17:20:36 -04:00
mwerezak ac738f3db4 Moves flags values to item_flags var
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
2015-08-18 17:18:25 -04:00
mwerezak 70b74518a1 Moves BLOCKHAIR flags to flags_inv
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
2015-08-18 17:06:50 -04:00
mwerezak b80c01ffbe Removes *COVERSEYES
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
2015-08-18 17:06:49 -04:00
Hubblenaut d2e2574f07 Merge remote-tracking branch 'upstream/dev' into dev 2015-08-16 20:39:50 +02:00
PsiOmega ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
mwerezak c70544f021 Fixes #10509 2015-08-12 00:58:40 -04:00