Commit Graph

194 Commits

Author SHA1 Message Date
Chinsky
4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping
[Ready for Merge] Custom Item Update/Addition
2015-02-10 09:23:47 +03:00
MrSnapwalk
05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06: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
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
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
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
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
sabiram
5d461f4976 Custom item deleted and added to loadout pool 2014-11-20 16:18:35 -05:00
Segrain
77ba15aea5 Slot_tie flags. 2014-11-19 18:29:51 +03:00
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
0f6811608e Merge pull request #7054 from mwerezak/cat
Fixes simple_animal emotes, implements custom item for for Foxler
2014-11-19 23:15:39 +10:30
mwerezak
4377ada588 Implements custom item for Foxler, fixes simple_animal emotes. 2014-11-18 16:19:59 -05:00
Chinsky
ff665a2cb3 Merge pull request #7039 from Amunak/beaker-fix
Beaker fix
2014-11-18 01:58:56 +03:00
Amunak
07b050435f fixes redundant information for a custom beaker description 2014-11-16 20:34:12 +01:00
MagmaRam
cdec94c5a8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into labcoat
Conflicts:
	code/modules/clothing/suits/labcoat.dm
This should hopefully fix all that conflict going on. Hopefully.
2014-11-16 02:56:32 -05:00
Zuhayr
8844f32385 Merge suit.dm 2014-11-16 18:15:40 +10:30
Zuhayr
823f01f4bf Changed helmet lights over to a general system/overlays. 2014-11-16 13:40:13 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
MrSnapwalk
7c50b2a010 Adds FearTheBlackout/Devildabeast's custom item. 2014-11-13 12:35:42 -06:00
MrSnapwalk
0ff612aea6 Adds Bromuzl's custom item to item_defines.dm. 2014-11-10 19:51:08 -06: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
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
mwerezak
b8cfe87ca2 Fixes #6783, moves spacesuits to a separate file
Adds an update_clothing_icon() proc to clothing items that will call the
relevant icon update proc on the mob which is equipping the clothing, if
any. Changes various clothing procs to not call update icon procs on usr
which may not even be the mob wearing the clothing.
2014-10-18 22:12:15 -04:00
Zuhayr
92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
Raptor1628
0314cbd8d1 Custom item fixes/adjustments
Polishes a few sprites and item defines.
2014-10-06 22:49:02 -04:00
Jarcolr
6a3f5d24d8 Adds 5 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=11097
http://baystation12.net/forums/viewtopic.php?f=33&t=11138
http://baystation12.net/forums/viewtopic.php?f=33&t=11300
http://baystation12.net/forums/viewtopic.php?f=33&t=11337
2014-09-28 21:31:24 +03:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
MrSnapwalk
8551a81c2b Adds the Cybernetic Casings custom item. 2014-08-30 18:53:04 -05:00
Zuhayr
f09d1218fe Master to dev merge. 2014-08-11 17:23:40 +09:30
Jarcolr
2db24a17d5 Typo 2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab Fixes 2 broken custom items, adds 1 new one
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
2014-08-10 11:49:14 +03:00
PsiOmega
a093bee190 Fixes #5839 by making the comb slightly more gender aware. 2014-07-31 11:43:22 +02:00
Jarcolr
1e90a5b218 Adds Raptor1628's hazard hardsuit
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
2014-07-31 10:44:34 +03:00
Jarcolr
e1267b7fdf Adds Supercotton's welding mask
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
2014-07-30 21:20:33 +03:00
Jarcolr
bd4d07c18a Adds 2 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=10949
http://baystation12.net/forums/viewtopic.php?f=33&t=10894
2014-07-29 22:08:32 +03:00
Jarcolr
5b77883f36 Adds 2 approved custom items and update
http://baystation12.net/forums/viewtopic.php?f=33&t=10952 for update
http://baystation12.net/forums/viewtopic.php?f=33&t=10850 for
Cataguette's item
http://baystation12.net/forums/viewtopic.php?f=33&t=10527 for Yankee's
item
2014-07-29 21:04:41 +03:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
Decius
3a92fe188c Changes labcoat sprite to be closed on custom item...
Signed-off-by: Decius <deciusreln97@gmail.com>
2014-07-14 21:11:46 -04:00
Zuhayr
7c6bec03ae Added Roaper's custom item, generalized the hardsuit modification kit somewhat, modified Solaruin's custom item accordingly. 2014-07-09 16:58:38 +09:30
Hubblenaut
d8f1b255a2 Fixes Sasha Mason-Kalinka's custom item 2014-07-02 10:16:15 +02:00
Jarcolr
be74be4c95 Fixes the jackboots 2014-06-28 14:11:58 +03:00
Jarcolr
5de1f11e8d Updates a item sprite and adds 2 approved items
http://baystation12.net/forums/viewtopic.php?f=33&t=10693
http://baystation12.net/forums/viewtopic.php?f=33&t=10678
Paths to new files are:
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/clothing/shoes/jackboots/fluff/kecer_eldraran
2014-06-28 11:33:49 +03:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
Boop
3dfc20eebe Fix a runtime for Mloc
(mloc is so lazy)
Also makes custom item spawning a tiny bit nicer!
file will only be loaded once, instead of every time someone spawns
2014-06-17 16:29:37 +01:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Jarcolr
3619dede1a Generalized kit
Hopefully this is going to be the last commit.
2014-06-08 20:00:31 +03:00
Jarcolr
6adc65dfcf Fixes 2014-06-08 19:02:42 +03:00