Jon
36755f077c
Removes the Resomi clothing from the custom loadout to prevent confusion as we're not intending to have Resomi crew, to my knowledge.
2015-11-27 16:58:48 +00: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
PsiOmegaDelta
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
mwerezak
7272deb5ae
Fixes #11216
...
Sunglass-derived custom gear is now only available to roles that normally have access to them.
2015-10-15 06:58:25 -04:00
SinTwo
a2b24d64b7
TG_Port_2
...
Conflicts:
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
code/modules/client/preferences_gear.dm
code/modules/clothing/under/accessories/accessory.dm
2015-10-11 00:36:13 -04:00
Jon
de2ee16588
Fixes issues with incorrect loadout ids
2015-10-11 00:26:57 -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
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
ef21f562fd
Added some Resomi uniforms/loadout options.
2015-09-06 18:49:33 +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
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Mark9013100
30babe48c3
Adds medical scrubs to custom loadout
2015-08-20 19:34:35 -04:00
Ccomp5950
11eefbc4c9
Merge pull request #9856 from Hubblenaut/dev
...
Beret Resprites
2015-08-19 17:56:37 -04:00
Hubblenaut
d2e2574f07
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-16 20:39:50 +02:00
GinjaNinja32
38f711b7c6
Merge remote-tracking branch 'upstream/dev' into jumpskirt
2015-08-13 05:39:27 +01:00
SparklySheep
27296e7caf
Update preferences_gear.dm
2015-08-12 12:13:28 -05:00
Mark9013100
17b6d4e3c7
Sec soft cap sprite improvements & ERT rig pathfile
2015-08-08 08:40:56 -04:00
Mark9013100
b601310f9b
Men in black
2015-08-08 06:01:35 -04:00
GinjaNinja32
1fc147088d
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-06-23 17:28:23 +01:00
Hubblenaut
5a026b1553
Overhauls berets, adds corporate black
2015-06-18 18:10:35 +02:00
mwerezak
b4c88c6186
Adds engineering workboots
...
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04:00
Zuhayr
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
Zuhayr
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
Yoshax
2c4783386f
Removes CE's hardhat
2015-04-29 16:11:53 +01:00
Yoshax
e5cd8c7adb
Fixes jacket
2015-04-28 20:40:16 +01:00
Yoshax
6c8bc809c6
Adds more items to custom loadout
2015-04-28 20:37:57 +01:00
Yoshax
a2cf2a4d1a
Adjusts custom item loadout costs to be more balanced and standardises costs, standard cosmetics are 1 point, items with uses/armor/storage are 2 points.
2015-04-22 16:19:59 +01:00
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
