Commit Graph

245 Commits

Author SHA1 Message Date
Patch
f054f72ac4 More Teshari icons (#2010)
* Add Teshari webbing icons from Bay

* Fix teshari suit/head items defaulting to old spacesuit icons

* Add in teshari sized armor icons from Bay
2016-07-01 04:08:05 +01:00
Mark9013100
d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
comma
b157ebfbac Breaks up some suits into parts
-Detective suit with vest (vest, tie)
-Charcoal suit (jacket,tie)
-Burgundy suit (jacket,tie)
-Navy suit (jacket,tie)
-Tan suit (jacket,tie)
2016-05-27 23:33:54 +01:00
comma
2daedf836b Made ties on some suits detachable
-Detective suit, grey
-Detective suit, dark
-Lawyer suit, blue,
-IA suit
2016-05-27 23:18:59 +01:00
Daranz
afcbebfe54 Fix on-spawn captain's medal attaching 2016-05-27 23:02:00 +01:00
Zuhayr
6281516826 Generalizes the accessory system to work for suits. 2016-05-27 23:01:47 +01:00
redstryker
420f2c8463 Adds Tracksuits 2016-05-27 15:19:07 -04:00
Yoshax
02fa5585c5 Fixes loadout skirts all spawning as black skirts 2016-05-23 19:35:13 +01:00
Mark9013100
c5cd4c6f97 Removes leg trim on the corp-sec uniforms 2016-05-19 17:04:35 -04:00
Datraen
2a6e86f4fc Merge pull request #1578 from SinTwo/clothes
Skirt addition and loadout refactor
2016-05-19 09:00:41 -04:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -04:00
Mark9013100
e3a63ffc5a Corrects the name of the engineering drop pouches 2016-05-18 11:39:49 -04:00
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
2016-05-06 21:03:18 -04:00
Datraen
454cc25cba Merge pull request #1526 from sabiram/master
Cleans up black jumpskirt icon and genericises description
2016-05-06 20:14:50 -04:00
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2016-05-06 18:31:07 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -04:00
Hubblenaut
8d7446a3c4 Adds drop pouches as alternate webbings 2016-05-06 21:00:28 +02:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Yoshax
3fe70209b6 Makes newly added dresses not look terrible with shoes 2016-05-02 02:18:59 +01:00
sabiram
cd68904e26 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-05-01 11:48:41 -04:00
sabiram
a1200fe7db Changes black jumpskirt description. 2016-04-30 21:17:32 -04:00
woodratt
320b17c37b 1.5.1 Baggy Jeans and Trousers and stuff.
- Organized jeans and pants in the dmi.
- Small change in the white pants shading.
- Added the missing inventory icon for grey jeans.
- Fixed missing mob icon for the yellow dress.
- Added baggy variants of the pants already in game.
2016-04-30 01:35:31 -07:00
Yoshax
0e3065f9dc Description & name fixes 2016-04-27 23:20:37 +01:00
Yoshax
c81679c0ee Adds some dresses 2016-04-27 23:14:58 +01:00
Anewbe
84d20d2963 Tweaks HoS Trenchcoat 2016-04-24 23:14:24 -05:00
EmperorJon
780d650f18 Merge pull request #1466 from Yoshax/chenogasm
Adds different colored cheongsams
2016-04-22 18:22:16 +01:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound.
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
Yoshax
9e2119a873 Adds different colored cheongsams 2016-04-21 21:28:34 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
EmperorJon
d95a1b7c68 Merge pull request #1385 from Datraen/FemaleShorts
Names female shorts to have them show up in the loadout system.
2016-04-10 13:33:58 +01:00
Datraen
9f6a1f059c Names shorts to have them show up in the loadout system.
Who likes short shorts?
2016-04-09 23:21:38 -04:00
Datraen
d40b34d4dc Adds jumpskirt to the jumpclothes list, renames selections for clothing. 2016-04-08 14:02:56 -04:00
Neerti
25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Datraen
e1c0256477 Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system. 2016-04-05 14:44:31 -04:00
Jon
eb0efbf2ef Adds grey jeans, jeans shorts, and jeans shorts (female). Kinda annoyed we have so many variants but that's for another day.
The grey jeans are the black jeans sprite (which are grey...)
The black jeans are now darker! But they still look different from black pants.
The black shorts have had their side-sprites darkened so they look black, not grey, and match the front/back view better.
The new grey variants keep those grey sides and have grey back and fronts too.
2016-04-04 00:07:50 +01:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Neerti
015c6ef58a Merge pull request #1284 from Mark9013100/3/29/2016mapfixes
Map fixes, minor edits
2016-03-30 02:25:35 -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
Mark9013100
f95cbbdc4a Ports /tg/'s armored trenchcoat sprite 2016-03-27 07:06:01 -04:00
Mark9013100
e87f19da39 Adds a sprite for the combat turtleneck 2016-03-24 03:22:53 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
redstryker
93def97663 Removed Armor and Siemens Coefficient from Skirts 2016-03-16 08:28:43 -04:00
redstryker
1a0a517f47 Adds Security Skirts 2016-03-15 23:04:26 -04:00
EmperorJon
041f1da5f7 Merge pull request #999 from Datraen/Sleeves_Eyepatch
Corrects the name of a suit in the icons and a suit's roll-ability
2016-02-16 20:05:15 +00:00
Datraen
f979e86ec0 Corrects the name of a suit in the icons and a suit's roll-ability 2016-02-16 13:07:09 -05:00
Zuhayr
8c1b7c06ad Made Teshari clothing not have any coverage. 2016-02-08 10:30:02 +10:30