Commit Graph

190 Commits

Author SHA1 Message Date
Alberyk
b66d6eab36 Detective gear fixes (#1311)
Fixes #1306
Fixes #1140
Updated the unathi alt language at jackboot' request
You can now wear cones on your head
2016-12-26 01:44:10 +02:00
LordFowl
93143a8e45 Vaurca Update Dec2016 (#1289)
Adds Vaurca subspecies and a whole slew of content related to them. Also, custom organs for them.
2016-12-25 01:11:09 +02:00
NanakoAC
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
Alberyk
d2b49ab1cb Hoodies and sec gear fixes (#1272)
Changes:
-ported hoodies from polaris/tg, I will place them somewhere someday
-fixed missing sec berets and badges missing sprites and being wrong at all
-fixed a lot of unecessary/troublesome code with the hos gear
-force gloves have a different sprite now
-fixed missing visible message when being hit by bullets
2016-12-22 20:07:01 +02:00
SoundScopes
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
Alberyk
908fc933f9 Fixing more error and the return of banhammer (#10) 2016-11-18 23:03:56 +02:00
skull132
ee68f3c9d0 Final merge
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00
skull132
e9b688e1f6 Merge branch 'development-2' into development
Christ on a stick. SO MANY ERRORS. REEE.

# Conflicts:
#	baystation12.dme
#	code/_helpers/lists.dm
#	code/_helpers/logging.dm
#	code/_helpers/text.dm
#	code/_onclick/click.dm
#	code/controllers/configuration.dm
#	code/controllers/master_controller.dm
#	code/datums/supplypacks.dm
#	code/game/antagonist/antagonist.dm
#	code/game/antagonist/antagonist_print.dm
#	code/game/antagonist/outsider/commando.dm
#	code/game/antagonist/outsider/ninja.dm
#	code/game/area/areas.dm
#	code/game/gamemodes/cult/cult_items.dm
#	code/game/gamemodes/game_mode.dm
#	code/game/jobs/access.dm
#	code/game/machinery/atmoalter/canister.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/mecha/mecha.dm
#	code/game/objects/effects/spiders.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/flash.dm
#	code/game/objects/items/devices/lightreplacer.dm
#	code/game/objects/items/devices/paicard.dm
#	code/game/objects/items/devices/scanners.dm
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/devices/uplink.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/toys.dm
#	code/game/objects/items/weapons/cards_ids.dm
#	code/game/objects/items/weapons/handcuffs.dm
#	code/game/objects/items/weapons/manuals.dm
#	code/game/objects/items/weapons/material/kitchen.dm
#	code/game/objects/items/weapons/material/misc.dm
#	code/game/objects/items/weapons/material/swords.dm
#	code/game/objects/items/weapons/melee/energy.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/scrolls.dm
#	code/game/objects/items/weapons/storage/belt.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/tools.dm
#	code/game/objects/objs.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/janicart.dm
#	code/game/sound.dm
#	code/game/turfs/simulated.dm
#	code/game/verbs/ooc.dm
#	code/global.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/verbs/modifyvariables.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/head/hardhat.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/clothing/head/misc_special.dm
#	code/modules/clothing/shoes/jobs.dm
#	code/modules/clothing/spacesuits/alien.dm
#	code/modules/clothing/spacesuits/captain.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces.dm
#	code/modules/clothing/spacesuits/rig/suits/alien.dm
#	code/modules/clothing/spacesuits/spacesuits.dm
#	code/modules/clothing/spacesuits/void/merc.dm
#	code/modules/clothing/spacesuits/void/void.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/clothing/suits/storage.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/economy/Events.dm
#	code/modules/economy/Events_Mundane.dm
#	code/modules/economy/economy_misc.dm
#	code/modules/events/blob.dm
#	code/modules/events/event.dm
#	code/modules/events/event_container.dm
#	code/modules/events/event_manager.dm
#	code/modules/events/money_lotto.dm
#	code/modules/events/prison_break.dm
#	code/modules/events/spacevine.dm
#	code/modules/hydroponics/trays/tray.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/emote.dm
#	code/modules/mob/holder.dm
#	code/modules/mob/language/station.dm
#	code/modules/mob/living/bot/cleanbot.dm
#	code/modules/mob/living/carbon/alien/diona/diona.dm
#	code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
#	code/modules/mob/living/carbon/give.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/outsider/vox.dm
#	code/modules/mob/living/carbon/human/species/station/golem.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/carbon/metroid/metroid.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defense.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/admin.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/drone/drone.dm
#	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
#	code/modules/mob/living/silicon/robot/emote.dm
#	code/modules/mob/living/silicon/robot/robot_items.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	code/modules/mob/living/silicon/silicon.dm
#	code/modules/mob/living/simple_animal/bees.dm
#	code/modules/mob/living/simple_animal/friendly/cat.dm
#	code/modules/mob/living/simple_animal/friendly/corgi.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob/living/simple_animal/friendly/mouse.dm
#	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob.dm
#	code/modules/mob/mob_grab_specials.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_alien.dm
#	code/modules/organs/organ_external.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	code/modules/projectiles/ammunition/bullets.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/guns/energy/rifle.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/pistol.dm
#	code/modules/projectiles/guns/projectile/revolver.dm
#	code/modules/projectiles/guns/projectile/shotgun.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/projectiles/projectile/special.dm
#	code/modules/reagents/reagent_containers.dm
#	code/modules/reagents/reagent_containers/food/drinks.dm
#	code/modules/research/designs.dm
#	code/modules/research/destructive_analyzer.dm
#	code/modules/research/rdconsole.dm
#	code/modules/spells/artifacts.dm
#	code/modules/spells/spellbook.dm
#	code/modules/tables/tables.dm
#	code/world.dm
#	config/example/config.txt
#	icons/mob/items_lefthand.dmi
#	icons/mob/items_righthand.dmi
#	icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
Alberyk
479666a47d Random maint loot and miscellaneous things (#1052)
Things done:
Created several random objects, that can be used to randomize loot in the maint or other places. Several items, some rare things and other random useful or not objects.
Added a svd gun with its own snowflakness, to replace the heister's lwap, but, they will get an extra energy gun to compesate.
Added tracksuits, stunrod, new sprite for the rapier, a new sword flavor and the old cane sword.
Changed the heister ship armory; two random melee weapons, the dragunov with an extra mag and a random energy gun.
Changed the chances of ghetto guns going bad.
Replaced the carbines in the ert area with energy pistols, so, they can make use of the holsters.
Clumsy people may have trouble with glowsticks now.
2016-10-26 20:29:38 +03:00
LordFowl
ea0f8c48d9 Dick Tracy and the Technicolor Dreamcoat (#1035)
User Changelog

rscadd: "Gave detective a colourable trench-coat, solving the Dick Tracy Dilemma."
tweak: "Wooden closets now have a slightly larger capacity, indicative of their greater size."
2016-10-24 00:23:07 +03:00
LordFowl
660a5d0063 Miscellaneous Content Patch (#1002)
rscadd: "Added three new energy-based weapons, one designed purely for pest-control."
rscadd: "Added a new rare handpistol, based off of a proposed competitor to the NT Mk58."
rscadd: "Added a new pet for the Head of Security - the PTR-7 Tranquilizer Rifle."
rscadd: "Syndicate manhack delivery grenades are now available via the traitor uplink."
rscadd: "Manhacks will no longer attack anyone belonging to the 'syndicate' faction, including Heist pirates."
tweak: "Tweaked loadout customisation whitelists, generally making them more restrictive by role."
bugfix: "It is no longer possible to be older or younger than your species ought to be."
2016-10-22 23:26:42 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Alberyk
cac92dfcc9 No more narsie over the news, and some minor fixes (#866)
no more cult of nar'sie over the news
no more yelling over breaking cuffs
ninjas should start with a contract uplink now
fixing a missing bluesec sprite
Removing vox from the species you can select at character creation
Fixed the L6 SAW using the wrong ammo type when reloading
2016-09-10 22:37:55 +03:00
Alberyk
c36f2c0f8b Changing the siemens coefficient of voidsuits, armor and certain jumpsuits (#826)
In this update:

Voidsuits have a better siemens_coefficient, the mercenary and wizard ones are far better.
Armor also had their siemens_coefficient buffed.
Security and the mercenary clothing also had a buff in their siemens coefficient.
Regular hos armor options should be all the same now, status-wise.
2016-09-04 21:43:17 +02:00
Alberyk
b66f5e0ef1 Implements Bluesecurity Icons (#815) 2016-08-27 18:21:34 +02:00
NanakoAC
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
Alberyk
df1f62a54c Custom items 10AUG2016 & contained sprites for accessories (#693) 2016-08-10 23:50:53 +03:00
LordFowl
56e288e910 Vaurca Content 2 (#426)
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
NanakoAC
cc3570f16f Armourpockets (#404)
Added pocket slots to most armours that didn't have them. 2 slots for vests, 4 slots for coats and fullbody suits. Improved useability of the Tactical Armour internal holster, it functions like a uniform-attached holster now.
2016-06-23 02:25:06 +03:00
Alberyk
e9c0dce6cf Adding more options to the custom loadout (#401)
Adding regular gloves for tajaran and unathi, besides the Synthetic Intelligence Movement armband and the return of the wallet.
2016-06-20 16:13:42 +03:00
Mahzel
dbf7fc178f Didn't paste? Oo 2016-01-13 23:37:21 +01:00
Mahzel
638f955420 Cell tracker 2016-01-13 23:28:04 +01:00
Zuhayr
1ab263f662 Rewrote targeting. 2015-12-16 10:10:13 +10:30
PsiOmegaDelta
665776f400 Merge pull request #11570 from Raptor1628/dev
Security Gear II
2015-12-03 21:22:34 +01:00
Raptor1628
2cd5a49498 Security Gear II
Collection of Security changes:

New heavy vest sprites, replacing the old toggle system.
New helmet sprites.
Heavy vests reduced to 2 pockets.
Regular vests have no pockets.
Holobadge sprite change and badge addition for HoS/Warden.
Teargas Grenades, replace flashbangs in vendor and officer lockers,
flashbangs located in armory and with warden.
Detective 1911 starts with flash magazine, has one rubber magazine in
locker.
Rubber bullet damage halved to reduce frequency of bone breakage and IB.
Flash bullet buffed to cause small halloss.
Armory loadout changed to static 4 e-guns, 4 laser guns, 2 ion rifles, 2
shotguns starting loaded with beanbags, 4 Mk 58s loaded with flash
rounds.
Tactical armor removed, still available in cargo.
Sub-Armory restored to warden access only, officer access storage rack
added.
Now with Changelog.

Threads and Polls located here:

http://baystation12.net/forums/threads/discussion-poll-security-energy-weapons-antag-projectile-weapons.932/

http://baystation12.net/forums/threads/discussion-poll-detective-weapon.865/
http://baystation12.net/forums/threads/discussion-armory.792/

http://baystation12.net/forums/threads/discussion-security-vest-and-helmet.790/

Quick Fix

	modified:   code/datums/supplypacks.dm
	modified:   code/game/machinery/vending.dm
	modified:   code/game/objects/items/devices/uplink_items.dm
	modified:   code/game/objects/items/weapons/grenades/chem_grenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
	modified:   code/modules/clothing/suits/armor.dm
	modified:   code/modules/clothing/suits/storage.dm
	modified:   code/modules/clothing/under/accessories/badges.dm
	modified:   code/modules/projectiles/guns/projectile/pistol.dm
	modified:   code/modules/projectiles/projectile/bullets.dm
	modified:   code/modules/projectiles/projectile/energy.dm
	modified:   code/modules/random_map/drop/drop_types.dm
	new file:   html/changelogs/Raptor1628-Dev.yml
	modified:   icons/mob/belt.dmi
	modified:   icons/mob/head.dmi
	modified:   icons/mob/suit.dmi
	modified:   icons/mob/ties.dmi
	modified:   icons/obj/clothing/hats.dmi
	modified:   icons/obj/clothing/suits.dmi
	modified:   icons/obj/clothing/ties.dmi
	modified:   maps/exodus-1.dmm
	modified:   maps/exodus-2.dmm
2015-12-02 13:42:41 -05:00
Zuhayr
e83a8adc2c Generalizes the accessory system to work for suits. 2015-12-02 18:04:21 +10:30
Zuhayr
e48a54fd85 Holsters will now show as 'occupied' on examine if something is in them. 2015-11-20 19:36:08 +10:30
mwerezak
af52b475ff Fixes missing cooldowns, missing cult blade sound. 2015-09-09 15:15:43 -04:00
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi
Adds the Resomi.
2015-09-06 13:09:34 +03:00
Zuhayr
ef21f562fd Added some Resomi uniforms/loadout options. 2015-09-06 18:49:33 +09:30
Chinsky
03f5254850 Restores suit rolling verb. 2015-09-01 13:50:38 +03:00
MrSnapwalk
d45d46f920 Resprites, renames, and repaths the detective uniforms. 2015-08-22 19:43:28 -05:00
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
mwerezak
0d9ef708d5 Merge pull request #9905 from GinjaNinja32/jumpskirt
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
2015-08-18 16:55:47 -04:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
GinjaNinja32
4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
GinjaNinja32
38f711b7c6 Merge remote-tracking branch 'upstream/dev' into jumpskirt 2015-08-13 05:39:27 +01:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
2015-07-27 10:20:20 +02:00
mwerezak
7157cc1748 Fixes #9326 2015-07-26 14:57:49 -04:00
mwerezak
263f721f3e Updates more hats
Also moves hat inhands to separate dmi.
2015-06-28 01:50:05 -04:00
mwerezak
c7ff5eebe3 Updates hats to use item_state_slots where necessary. 2015-06-27 23:33:33 -04:00
GinjaNinja32
1fc147088d Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item 2015-06-23 17:28:23 +01:00
Zuhayr
6f00d831e5 Merge pull request #9826 from PsiOmegaDelta/150615-EmagAct
Base proc: emag_act
2015-06-21 01:18:25 +09:30
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
PsiOmega
0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
Zuhayr
6564fd6663 Messed this up. 2015-05-30 04:06:23 +09:30