cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,249 Commits 6 Branches 0 Tags
233b9a5d11c45c3c6b76c78ff84d86b5ad9da857
Commit Graph

212 Commits

Author SHA1 Message Date
Yoshax
233b9a5d11 Adds Sabess' custom item 2015-04-29 16:47:20 +01:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
mwerezak
229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/modules/customitems/item_defines.dm
 2015-04-26 02:04:59 -04:00
PsiOmega
1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning 
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
 2015-04-24 17:13:37 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
PsiOmegaDelta
ee88da4cea Merge pull request #8966 from Baystation12/master 
Dev
 2015-04-24 09:20:16 +02:00
mwerezak
0a7fd34f3f Limb augments no longer prevent putting on jumpsuits 2015-04-23 11:27:16 -04:00
mwerezak
7a6a54b671 Fixes Snapwalk's Limb Augment item being removable through the inventory panel 
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
 2015-04-23 08:25:49 -04:00
mwerezak
f86642a74e Updates clothing/under to use item_state_slots. 
Also fixes a lot of incorrect jumpsuit item_state values.
 2015-04-23 08:03:40 -04:00
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
mwerezak
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
MrSnapwalk
9463ab028a Adds Andrewmeythaler's custom item. 2015-03-17 22:19:13 -05:00
mwerezak
3ae3ef7961 Merge remote-tracking branch 'upstream/dev' into runtime 2015-02-22 21:13:20 -05:00
mwerezak
69284990a3 Merge remote-tracking branch 'upstream/dev' into runtime 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/cat.dm
 2015-02-15 22:24:36 -05:00
mwerezak
5740f52964 Merge branch 'guns' into gun-rewrite 
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
 2015-02-11 18:08:43 -05:00
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
mwerezak
147ca72f7c Reorganizes custom item cat code 2015-01-25 15:08:17 -05:00
mwerezak
58bb2f22cd Implements making friends with Runtime 2015-01-25 02:39:40 -05: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