DZD
3c29805776
Gibson1027 Fluff items
...
- Bear pelt hat subtype that is instead a polar bear pelt that has its
edges covered in blood. This is missing a proper non-mob icon, currently
uses the default bear pelt hat, but shows up as the polar bear pelt on
mobs when worn.
2015-06-29 19:36:35 -04:00
FalseIncarnate
be5f8b6ad3
Prescription Upgrades and Sec Beret Sprite Fix
...
Adds the ability to combine prescription glasses with a couple other
glasses
- Mesons + Prescription Glasses = Prescription Mesons
- You cannot upgrade the Night Vision Mesons with prescription glasses
- Sunglasses + Prescription Glasses = Prescription Sunglasses
- HUDSunglasses + Prescription Glasses = (NEW!) Prescription
HUDSunglasses.
Adds the ability to use a screwdriver to disassemble (separate) the
above upgraded glasses.
- Returns the prescription glasses and the
mesons/sunglasses/HUDSunglasses
Also fixes the sprite for the north-facing Security Officer Beret
randomly having some orange pixels.
2015-06-25 19:54:38 -04:00
SamCroswell
4e3f4bfa17
Adds Vision Flags for Helmets
2015-06-11 23:15:42 -04:00
Fox-McCloud
7b455d8b89
Re-Works Maintenance Loot
2015-06-04 18:53:13 -04:00
TheFlagbearer
a88240c2ce
Quickfix for the Arachno-Man Mask
...
I know this is my fourth PR regarding this item but bear with me. It's
been 4 days since I started doing this stuff.
My previous PR fixed everything EXCEPT for the mask, which remained the
same. This fixes that.
2015-05-27 21:10:17 -04:00
TheFlagbearer
b24c1a783f
Item sprites and defines
...
Fixes the Arachno-Man items. Hopefully doesn't cause a merge conflict.
If it does, I'll be forced to leave this PR open until someone helps out
or it's closed by a Senior Admin.
2015-05-26 21:32:42 -04:00
TheFlagbearer
a483ba4145
Revert "Custom Items - The Flagbearer"
2015-05-26 18:33:41 -04:00
TheFlagbearer
892bfdda95
Custom Items - The Flagbearer
...
Custom fluff items
2015-05-24 19:08:12 -04:00
ZomgPonies
7423d56c06
Adds E-N and gear
2015-05-07 16:12:43 -04:00
FreeStylaLT
c290b1471e
Engineering berets changes
...
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Svej
a0e1cd5683
Nanotrasen Representative hat
...
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
Markolie
c09c27958a
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
maps/cyberiad.dmm
2015-03-08 20:10:49 +01:00
ZomgPonies
b573472e55
Adds missing spacesuits to plasmamen
2015-03-08 14:34:39 -04:00
Markolie
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
Markolie
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
Markolie
e4328a7f5e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/suits.dmi
2015-02-28 17:13:53 +01:00
Markolie
f7426c8d72
Add bandanas, mask toggling, camo armor jacket and bugfixes
2015-02-28 17:09:45 +01:00
ZomgPonies
eaeb045afe
Unique suits for plasmamen jobs
2015-02-26 13:32:42 -05:00
ZomgPonies
ccfb89199e
New sea admiral suit and hat
2015-02-26 12:58:20 -05:00
ZomgPonies
8714512403
Superhero Part 2: Owlman vs. The Griffin!
2015-02-24 20:13:00 -05:00
Fox-McCloud
be2e754706
Syndicate Rebalance
2015-02-20 03:14:12 -05:00
DZD
e720ab7140
Fix merge conflicts
...
Fixes merge conflicts with icons\mob\head.dmi and icons\mob\suit.dmi
2015-02-08 19:49:23 -05:00
DZD
de9accc64d
TG Changeling Port
...
This would've been multiple commits, but I kept forgetting to ACTUALLY
commit things. Changes logged in the PR.
2015-02-08 19:42:01 -05:00
Fox-McCloud
eaa54e35a7
Vox Hardsuits and Spacesuits
2015-01-26 18:04:22 -05:00
Fox-McCloud
81a4bfed43
Security Clothing
2015-01-07 23:11:52 -05:00
Fox-McCloud
ff2b7cedb2
Clothing Restructuring
2015-01-02 12:40:42 -05:00
Fox-McCloud
a92921786f
Clothing Update
2015-01-01 11:23:48 -05:00
Fox-McCloud
3b884622c5
Job Changes
2014-11-29 09:10:31 -05:00
melandor0
2f7dafda93
Sparkyninja's beret
2014-11-24 03:30:03 +01:00
Markolie
2d36851119
Syndicate hardsuit helmet fix, SyndiBorg PDA fix
2014-11-23 23:52:13 +01:00
SamCroswell
722fd6a1e0
Nukeops Update
...
- Gave the nukeops leader the ability to choose the name of their team.
- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.
- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.
- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
Bone White
e836d6abdf
Added new black surgical scrubs
...
Potentially for new mortician job. Sprited by Pancake.
2014-09-08 02:46:24 +01:00
Necaladun
40c5e5ddaf
Donator Item
...
Purple beret fluff item for a donator
2014-08-31 12:01:31 +09:30
IndexLP
b01952661f
Applies changes to the captains beret (was missed) and fixes the side veiw of a couple berets which were to far down.
2014-08-15 02:26:36 -04:00
IndexLP
bb3c162718
Fixes for the berets so they dotn float above the players head when veiwed from behind, and minor chnages to the behind profile to make them look better in addition to not floating.
2014-08-15 01:46:48 -04:00
Rob Nelson
7832e1c26f
PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN
...
Conflicts:
.gitignore
baystation12.dme
code/_onclick/hud/screen_objects.dm
code/modules/clothing/spacesuits/alien.dm
code/modules/media/tapedeck.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/species.dm
html/changelog.html
icons/mob/back.dmi
icons/mob/head.dmi
icons/mob/in-hand/in-hand_sync_report.txt
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/tank.dmi
2014-07-31 18:58:49 -04:00
ZomgPonies
8c71bfb568
Notsee uniform sprites
2014-07-25 18:22:25 -04:00
ZomgPonies
4bfa67e053
Clown wizard gear.
2014-07-18 06:10:59 -04:00
Necaladun
efda638b09
Mercy hood fixes #1
...
Misaligned
2014-06-22 10:39:02 +09:30
Necaladun
f1bb11a74f
Fluff item - mercy robes
...
Donator fluff sprites
2014-06-22 01:10:48 +09:30
ZomgPonies
b9fe3ab514
Added choking people with plastic bags.
2014-06-05 04:43:30 -04:00
Zuhayr
7d4de896ae
Icon reshuffle/rename for following commit.
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-05-26 12:58:43 -04:00
Regen
a3f76fe4f4
Fixed engineering berets
2014-05-25 22:18:10 +02:00
Robson Richards
e9885bdd4d
Adds Nienhaus's Sprites (Again)
...
Conflicts:
code/unused/powerarmor/powerarmor.dm
code/unused/powerarmor/powerarmorcomponents.dm
icons/mob/feet.dmi
icons/mob/hands.dmi
icons/mob/head.dmi
icons/mob/suit.dmi
2014-05-20 06:16:29 -04:00
Zuhayr
d606d774d8
Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing.
...
Conflicts:
baystation12.dme
code/controllers/configuration.dm
code/game/objects/items/weapons/AI_modules.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/examine.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_modules.dm
code/modules/recycling/disposal.dm
icons/mob/robots.dmi
icons/obj/device.dmi
2014-05-12 01:41:02 -04:00
Necaladun
3e3fc0f314
Wisewill Sprites
...
Added wisewills sprites - bane stuff, sec rig fixes
2014-04-15 00:29:51 +09:30
Heredth
58b8102ed1
Erm, these contain the actual SPRITES for the hats and such. Heh.
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
icons/obj/vending.dmi
2014-03-11 06:15:52 -04:00
melandor0
f57998a006
Mouse Ears
...
Yay! A child of kitty ears.
2014-03-06 16:43:25 -05:00
suethecake
1d725c056b
Visual update of security explosive ordinance disposal suit.
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-02-01 18:59:27 -05:00
alex-gh
3881a3456e
Singuloth armor sprite bugfix.
2014-01-26 01:30:44 +01:00