Commit Graph

46 Commits

Author SHA1 Message Date
PsiOmega
66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
Yoshax
76bde4de93 Adds jackboots for dirty aliens to custom loadout 2015-04-02 23:21:52 +01:00
mwerezak
1150902c9f Adds custom item for Von2531
Blue blazer loadout item
2015-03-09 16:57:10 -04:00
Raptor1628
2ae273e1b8 Gear again
Collection of gear and changes from the four gear polls on the forums
includes:
2 new automatic weapons, mapped in to ERT and random weapon spawns.
Laser carbine balance.
Slow emergency softsuits, no armor value other than bio and rad, 4
slowdown.
1 knife, not mapped in, available for Psi's uplink merge.
New vests: 2 types, 2 pocket no slowdown,
4 pocket with slowdown, second is available from cargo and one random
vest
spawn in armory. The first replaces all instances of the old vests. Old
vests still exist in code.
Mercenary vest with no slowdown, 4 pockets, and slightly better armor,
not on map, possibly for Nukes or Traitor Uplink
Holster rearrangement for custom loadout.
Acid dispenser, mapped into robotics and science.
New food items, added to vendors and rations crate.
New random medical spawns, added to medbay.
Cargo and loadout additions to accommodate new items.
1 beanbag loaded 5 round shotgun added to Warden's closet to compensate
for officers having .45 ltls and the HoS having an e-gun, suggested by
IRC and server.

http://baystation12.net/forums/viewtopic.php?f=5&t=12064

http://baystation12.net/forums/viewtopic.php?f=5&t=12031

http://baystation12.net/forums/viewtopic.php?f=5&t=12027

http://baystation12.net/forums/viewtopic.php?f=5&t=12007
2015-02-18 15:35:37 -05:00
Chinsky
30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Zuhayr
0091aca22c Merge with dev. 2015-02-04 11:05:35 +10:30
Chinsky
848d1cddd5 Merge pull request #7591 from mwerezak/custom-item
Adds blue suit jacket to custom loadout gear
2015-02-03 18:09:44 +03:00
Chinsky
81e40aa542 Merge pull request #7794 from sabiram/dev
Adds approved custom item to common loadout pool
2015-02-03 18:09:32 +03:00
SkyMarshal
8898689c5d Cleared out my WIP folder. 2015-02-03 03:20:42 -07:00
sabiram
9497afa402 Recoloured spite 2015-01-26 18:40:13 -05:00
mwerezak
aeec54aece Fixes bad gear datum paths 2015-01-12 00:19:01 -05:00
sabiram
66ab6bffba Adds my approved custom item (baystation12.net/forums/viewtopic.php?p=255276) to the common loadout pool. 2015-01-10 22:55:29 -05:00
Zuhayr
e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
mwerezak
3381c615ef Adds blue suit jacket to custom loadout gear
Custom item for Nyarlthotep, implemented as custom loadout gear.
2014-12-31 01:00:49 -05:00
Zuhayr
2214837449 Comments out combi-tool, fixes infinite range combitool. 2014-12-16 18:23:21 +10:30
Zuhayr
7efae862a2 Fixes #7290 2014-12-13 23:04:13 +10:30
PsiOmega
b9ce5404d8 Fixes lab coat without icon.
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
SparklySheep
f8bc1708af Lowered to 2 points. 2014-11-30 23:20:24 -06:00
SparklySheep
0a43dd0860 Adds pAI cards to the loadout. 2014-11-30 23:12:04 -06:00
PsiOmegaDelta
c8e00f3e20 Merge pull request #7089 from sabiram/dev
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
Ccomp5950
3ca02037ef Merge pull request #7088 from mwerezak/skrell
Implements skrell changes for Searif
2014-11-22 03:23:41 -05:00
sabiram
bdf4905289 I am dumb
It is what it is.
2014-11-20 17:08:24 -05:00
sabiram
5d461f4976 Custom item deleted and added to loadout pool 2014-11-20 16:18:35 -05:00
mwerezak
1751caa64f Adds skrell headtail items 2014-11-20 15:51:52 -05:00
Segrain
bec483aa1b Alphabetical sorting. 2014-11-19 19:05:06 +03:00
Segrain
c4d95c39f1 Folders, fixes. 2014-11-19 18:42:34 +03:00
Segrain
a475247f11 Proper slot equipment. 2014-11-19 18:35:44 +03:00
MagmaRam
3e5117e3eb All coats that can be buttoned are now subtypes of /obj/item/clothing/suit/storage/toggle
This includes labcoats, IA jackets, first responder jackets, and the brown leather jackets.

This way, code for button toggling doesn't have to be duplicated for labcoats and other coats, and it's easier to add other types of coats that can be buttoned up if someone wants.
2014-11-11 11:27:11 -05:00
mwerezak
6ac3c4c359 More custom loadout jackets + bandana
Adds custom loadout gear:
Searif's brown leather jacket, NT brown leather jacket, and grey hoodie.
Also brings back the orange bandana, and adjusts some siemens
coefficient values that weren't making sense.
2014-11-02 22:51:33 -05:00
mwerezak
7e2e44a61a Adds Searif's leather jackets as a custom gear 2014-11-01 23:12:21 -04:00
mwerezak
a9399c2b79 Custom loadout updates
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
2014-11-01 15:56:11 -04:00
Chinsky
3887ada4a4 Merge pull request #6866 from PsiOmegaDelta/Bomber
Most minor spelling correction.
2014-10-29 06:31:11 +03:00
mwerezak
b8805a493f Adds two new poncho types, adjusts bomber jacket cold protection
Adjusted the cold protection so it might actually be noticable now, forgot earlier that it was mitigated by uncovered areas.
2014-10-28 21:05:58 -04:00
PsiOmega
4eb4869205 Most minor spelling correction. 2014-10-27 23:09:16 +01:00
Chinsky
3796c034f3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into master-dev
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
	maps/tgstation2.dmm
2014-10-20 04:52:45 +04:00
Zuhayr
e7e50e9f51 Fixes #6745 2014-10-18 07:57:18 +10:30
Zuhayr
6d1fd2886b Added goddamn atrocious wig for Earthcrusher. 2014-10-12 11:58:58 +10:30
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
431a7474ea Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:17 +10:30
Mloc
056fbd79d1 fixes #6599
also small improvements to the loadout system

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-06 09:57:01 +01:00
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
Zuhayr
6981ca52f4 Trying to fix the loadout spawn issue, at least this will make it more informative. 2014-07-12 10:35:31 +09:30
Zuhayr
3955edd04b Final touches for loadout system. 2014-07-11 12:16:08 +09:30
Zuhayr
903679bd79 More work on gear loadouts. 2014-07-11 11:47:53 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
Zuhayr
515e78f760 First pass on custom loadouts. 2014-06-25 15:47:38 +09:30