6cef8c9074
Attack Proc fixes ( #1259 )
...
Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly.
This proc does three main things.
Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied.
Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works.
Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.
2016-12-24 03:34:23 +02:00
97bb1e8e38
Travis: Indentation / list fixes ( #1254 )
...
Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
2016-12-19 16:40:52 +02:00
cdd4772177
Merge branch 'master' into merge/level_dev_master
...
# Conflicts:
# code/game/machinery/vending.dm
# maps/exodus-1.dmm
# maps/exodus-2.dmm
2016-12-19 00:23:19 +02:00
9b094ad0eb
Merge branch 'upstream/development' into development
...
# Conflicts:
# code/_helpers/time.dm
# code/game/objects/items/devices/floor_painter.dm
# code/game/objects/items/stacks/medical.dm
# code/global.dm
# code/modules/cargo/randomstock.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_movement.dm
# code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
80bc02346e
Custom items 25/11 ( #1184 )
...
Some items that were never made due to the lack of sprite/being hard as fuck to sprite/i forgot. Special thanks for TheGreatJorge for being a based spriters and getting those done.
Medizinercorps armband - Karl Jonson - arrow768
Ceremonial Whip - Rook Jameson - hivefleetchicken
Black Labcoat - LiLITH - ladyofravens
Jeweled Tiara - Sayyidah Al-Kateb - alberyk
Also, removing xelnaga's implant, at his request.
2016-11-30 22:17:13 +02:00
9803e14486
Custom items 20/11 ( #1171 )
2016-11-21 12:05:31 +02:00
3000944d68
Custom items 06/11 ( #1126 )
...
Items being added:
Tagging Collar - R.U.R - coalf
Fancy Scarf - Simon Greene - icydew
Karson's Cap - Eric Karson - dronzthewolf
Framed Zatimono - Azkuyua Triaka - jackboot
2016-11-08 00:19:27 +02:00
122f1e0ebe
Fixing missing posters and new additions ( #1093 )
...
Adds some new posters
Fixes #1078
2016-10-30 20:12:31 +02:00
6e7becf0b8
Custom items - 24/10 ( #1064 )
...
Heart Condition Implant - Ziva Ta'Kim - sierrakomodo
Worn Badge - Caleb Greene - notmegatron
Pressing of Messa's Tears - Poslan Kur'yer-Isra - jboy2000000
Pressing of S'Rendarr's Hand - Poslan Kur'yer-Isra - jboy2000000
Twin Suns Throw-over - Poslan Kur'yer-Isra - jboy2000000
Xenonuerology Doctorate - Alexis Shaw - tenenza
2016-10-29 18:41:57 +03:00
db7589be29
Custom items 27/09/2016 ( #1017 )
...
Items included in this update:
Atlas Overcoat - Vittorio Giurifiglio - tytostyris
CERN Labcoat - Helmut Kronigernischultz - pyrociraptor
Marching Sandals - Sslazhir Yinzr - alberyk
Jeweled Broach - Aji'Rah Laikov - nebulaflare
Akela's Family Photo - Akela Ha'kim - moltenkore
Also tweaked sprite to Sayyidah's dress and some naming with items.
2016-09-28 19:25:58 +03:00
d4533017ce
Fixing missing duffel bags ( #974 )
...
Now, all jobs should start properly with one.
2016-09-20 17:58:59 +03:00
e160c35774
Dev fixes-alberyk ( #904 )
...
Fixes half of #893
Fix usiki's cane
Fix an issue with the brig map
Borked revolver messages
2016-09-11 11:30:33 +03:00
6ef0d2061a
Custom Items - 09SEP2016 ( #878 )
...
Items added in this update:
Hand-me-down Bomber Jacket - superballs - Ash LaCroix
Dog Tags - Dylan Sutton - sircatnip
Racing Stripes - Ricochet - nebulaflare
First Shot - Gabriel Barcia - mrgabol100
Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso
Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk
2016-09-09 21:37:50 +03:00
e240def2bf
Contained Sprites v2 ( #758 )
...
Overhauls the contained sprites system to be feature complete in terms of what it can do and offers. Now almost all cases of clothing and other items may use the system properly.
2016-08-25 16:55:42 +02:00
df1f62a54c
Custom items 10AUG2016 & contained sprites for accessories ( #693 )
2016-08-10 23:50:53 +03:00
c7796455bc
Fixing custom mech paint kits and adding the tiger's claw custom item ( #673 )
...
Alright, I will keep the bay system, since it seems to work better, and now exosuit sprites will go in custom objects. Also, fixing a missing item, and zubari spawning with two fancy jakckets, in the new config, which should replace the actual one:
2016-08-06 02:42:25 +03:00
76d2630106
Custom items, second wave. ( #656 )
2016-08-03 22:07:28 +03:00
ed42f5011f
Porting contained sprites and first custom item wave ( #484 )
...
Porting the contained sprite var from old code, allowing for less problems with icon storages in the future.
Custom items added:
Antique Pocket Watch - Eric Derringer - xelnagahunter
Mendoza's cap - Chance Mendoza - loow
Ziva's Bandana - Ziva Ta'Kim - sierrakomodo
Fancy Jacket - Zubari Akenzua - filthyfrankster (req_titles: Security Officer, Warden, Head of Security, Detective, Forensic Technician)
Heirloom Unathi Mantle - Sslazhir Yinzr - alberyk
Chich Eyewear - Roxy Wallace - nebulaflare
Data Chip - Roxy Wallace - nebulaflare
Sharpshooter Gloves - Hawk Silverstone - nebulaflare
Data Drive Pendant - Kyyir'ry'avii Mo'Taki - nebulaflare
Graphite's chassis - Grap..Null - dreamixpl
Skrell Purple Head Cloth - Shkor-Dyet Dom'Pesh - mofo1995
Pocket Altar - Kiara Branwen - nursiekitty
Brown Hat - Avery Bell - serveris6
Pinned Brown Coat - Avery Bell - serveris6
Also, adding old custom synth sprites from old code.
2016-07-11 16:46:28 +03:00
b6e6d45952
Small tweaks to get rolldowns to work properly.
2015-08-09 17:01:07 +09:30
9d11a367a6
Roll-down-jumpsuit now works properly with custom items, icon_override and (hopefully) species variants.
2015-08-09 16:22:19 +09:30
c7d9ce4697
Merge pull request #10046 from mwerezak/custom-item-icons
...
Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-09 20:52:38 +03:00
8957412826
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
Makes item_icons take precedence over icon_override for inhands only.
2015-07-08 01:39:02 -04:00
ed5a12c2a2
Revert "[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes"
2015-07-07 17:14:42 +02:00
62017e7af2
Merge pull request #10008 from mwerezak/custom-item-icons
...
[DNM] Makes custom items use the host item's inhand sprites if none are provided, knife fixes
2015-07-07 06:44:10 +02:00
c1bbc5c3a6
Fixes issues with raider equipping
...
Fixes raiders not being able to ever spawn with guns that cannot be equipped to the belt, despite those gun types being in the raider_guns list.
Fixes raiders spawning with guns for which they have no ammo.
Fixes taj/unathi raiders having a 2/3 chance of spawning without any shoes.
2015-07-04 16:32:35 -04:00
7af63ede5a
Custom items default to the inhands of the parent
...
Makes custom items use the inhand states and icons of the parent item
type if inhand states are not present in CUSTOM_ITEM_MOB.
2015-07-04 10:40:44 -04:00
890693b839
Allowed accessories to function as custom items using icon_override
2015-05-16 01:37:04 +09:30
f908119b98
Very minor oversight.
2015-05-12 23:56:51 +09:30
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
f76a1d2024
Removed custom item defines, refactored mech kits.
2015-05-12 15:49:56 +09:30
59af7e5c4d
Refactor/rewrite of custom item spawning.
2015-05-12 15:14:51 +09:30
ed60b17f8d
Cherrypicking Mini's custom item code.
2015-05-12 11:02:34 +09:30
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
471988b080
Adds foxeye's custom item
...
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
2015-05-02 11:19:52 +03:00
233b9a5d11
Adds Sabess' custom item
2015-04-29 16:47:20 +01:00
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
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
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
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
ee88da4cea
Merge pull request #8966 from Baystation12/master
...
Dev
2015-04-24 09:20:16 +02:00
0a7fd34f3f
Limb augments no longer prevent putting on jumpsuits
2015-04-23 11:27:16 -04:00
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
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
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
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
1b4e13aabc
Removes unnecessary and cruft procs from mob/inventory.dm
2015-03-30 05:28:09 -04:00
9463ab028a
Adds Andrewmeythaler's custom item.
2015-03-17 22:19:13 -05:00
3ae3ef7961
Merge remote-tracking branch 'upstream/dev' into runtime
2015-02-22 21:13:20 -05:00
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
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
NanakoAC