Fox-McCloud
99bf49504a
LINDA Pressure Changes
2015-07-11 06:28:03 -04:00
Tigercat2000
0691822f9c
Mob Resizing, -tg- mob lying standarization
2015-05-27 15:58:13 -07:00
FalseIncarnate
55087890de
Brooms, Stick-horses, and Flying Wizards!
...
A port of https://github.com/d3athrow/vgstation13/pull/4377

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.
You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.
And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
Tigercat2000
e1249fc640
Lighting overhaul.
...
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
DZD
00035a51f0
It compiles!
...
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
ZomgPonies
91e8b909c0
Squish Squash
2015-04-04 14:27:53 -04:00
ZomgPonies
0fd3cdfb33
Fixing the SSD infinite sleep bug
2015-03-05 13:34:01 -05:00
Markolie
bfe8a12f1e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/objects/items/weapons/kitchen.dm
2015-02-25 20:44:32 +01:00
Markolie
e1f0d0fec7
Bug fixes, add atmos watertank
2015-02-25 19:47:04 +01:00
FalseIncarnate
60d27e07de
Emote Cooldown System
...
Introduces the Emote Cooldown System, designed to prevent spamming of
sound-based emotes.
Emotes that respect the cooldown:
- *beep
- *buzz
- *ping
- *squish
- *scream
- *fart
- *chirp
- *law
Emotes that are exempt:
- Everything not listed above
Emotes can be added to the system easily, and all cooldown-incurring
emotes share a single cooldown. This means you have to wait to *scream
after you *fart.
Also adds Tigercat's *squish emote ( #394 ), with sound credit to
DrMinky(Freesound.org). This emote is only usable by Slime People, and
accepts a parameter if you wish to squish at something/someone.
Admins with +VAREDIT can manually disable the use of cooldown emotes for
a specific mob by setting the emote_cd var to 2.
2015-02-25 01:14:06 -05:00
Fox-McCloud
fd23cc9861
Out of Time
2015-02-03 01:12:00 -05:00
Fox-McCloud
78d161742e
Healthdoll
2014-12-14 16:43:06 -05:00
Markolie
37b86cd8f1
Xenos gamemode rework
2014-12-13 02:08:22 +01:00
ZomgPonies
431ab486b3
Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)
2014-07-23 11:04:07 -04:00
ZomgPonies
64554340f4
Modifed faction system to use a list instead. Mobs can belong to multiple factions at once.
2014-07-19 13:26:55 -04:00
ZomgPonies
9148e4b4a9
Removing more deprecated virus1 shit
2014-07-18 11:41:46 -04:00
jack-fractal
3df35fe03c
modifying visibility interface of ai to use generic visibility_interface
...
Conflicts:
baystation12.dme
code/game/gamemodes/malfunction/Malf_Modules.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
code/modules/mob/living/silicon/ai/freelook/chunk.dm
code/modules/mob/living/silicon/ai/freelook/eye.dm
code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
2014-05-15 04:43:49 -04:00
MrPerson
5bb608e56e
Redo of jitteriness and dizziness.
...
Fixes #2923
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
code/game/mecha/equipment/weapons/weapons.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/mob.dm
code/modules/mob/mob_defines.dm
code/modules/reagents/Chemistry-Reagents.dm
2014-02-28 22:21:33 -05:00
Rob Nelson
9364a81746
Fix new genetics stealth powers.
...
Conflicts:
code/modules/mob/mob_defines.dm
2014-01-25 12:26:34 -05:00
Rob Nelson
450a5dec8e
Start wrapping up the new domutcheck logic
...
Conflicts:
code/game/dna/dna2_helpers.dm
code/modules/mob/mob_defines.dm
2014-01-20 01:15:15 -05:00
Zuhayr
70d16798b5
Fixed some issues with the diona holder item, generalized it out a little. You can now deconstruct dionaea and probably put them into the washing machine.
...
Conflicts:
code/modules/mob/living/carbon/monkey/diona.dm
2014-01-09 21:22:51 -05:00
ZomgPonies
b857c90f6c
Compile fix
2014-01-06 17:47:20 -05:00
Fira
70f50e7850
Partial fix for pAI emotes (they still can't hear beyond one container
...
level, will require a say/emote code hack)
Conflicts:
code/modules/mob/mob_defines.dm
2014-01-06 17:46:51 -05:00
ZomgPonies
9ad437b8c5
Adding checks for LAssailant everywhere whee
2013-12-23 04:57:44 -05:00
ZomgPonies
5ce256b73c
Organ/Surgery Overhaul Part 1
2013-12-19 07:25:55 -05:00
ZomgPonies
d42b881ad3
Added species abilities, starting with ventcrawl for slime people
2013-12-11 03:30:40 -05:00
ZomgPonies
f60b0e610b
AntagHUD for admins and ghosts (who cannot respawn)
2013-11-30 06:39:04 -05:00
ZomgPonies
5daf979b72
Pretty much all new click code
2013-10-12 14:44:36 -04:00
ZomgPonies
e3556791a7
Fancy Alt-Clicking for blob and others
2013-09-24 20:12:12 -04:00
ZomgPonies
c1222034ee
BS12 -> Ponies merge
2013-09-09 10:51:16 -04:00
ZomgPonies
a935863200
Made blob gamemode work, removed ninjas because needs overhaul, optimized some strings
2013-09-08 11:39:33 -04:00
Mloc-Argent
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Mloc-Argent
9d2e107005
Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-25 18:30:24 +01:00
Jamini
920b855f6c
Added employment records.
...
Added employment records console.
Added circuit for employment records.
Added employment records consoles to every head of staff office. (Map)
Added a circuit spawn for an employment console in tech storage (Map)
Fixed pod 5.
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-07-24 22:23:50 -04:00
Mloc-Argent
cf53dd7a10
Revert "Adds in the Kida"
...
This reverts commit a2fddc0fc1 .
2013-07-12 12:22:35 +01:00
Zuhayr
23299809f6
Armalis sprites, simple animal/mob yank-out verb and embedding.
2013-06-16 00:38:40 -07:00
Zuhayr
b1cac56e9a
Merge resolution.
2013-06-15 03:54:22 -07:00
Zuhayr
6b73b8ec2f
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
2013-06-13 20:46:09 -07:00
NicholasDV
a2fddc0fc1
Adds in the Kida
...
Adds in the Kida Race to all parts.
2013-06-13 18:22:05 -04:00
Zuhayr
06f04e6374
Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite.
2013-06-05 17:35:38 +09:30
Chinsky
55671d7485
Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode
...
Conflicts:
code/modules/mob/living/simple_animal/simple_animal.dm
icons/mob/screen1_old.dmi
2013-03-06 17:04:45 +04:00
RavingManiac
839d4cb6c8
Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse().
2013-02-19 22:10:27 +08:00
Whitellama
5d090b0611
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into guntest
...
Conflicts:
code/WorkInProgress/Cib/amorph/amorph_hud.dm
code/game/objects/structures/window.dm
code/modules/mob/living/blob/blob.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/mob_defines.dm
code/modules/mob/screen.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/tgstation.2.0.9.1.dmm
2013-01-31 14:26:58 -08:00
Cael_Aislinn
bb5a349fcf
Merge branch 'incremental_tg' r5600 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/controllers/master_controller.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/wizard/rightandwrong.dm
code/game/hud.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/job.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/machinery/computer/cloning.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/implants/implantnanoaug.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/turfs/turf.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/shoes/miscellaneous.dm
code/modules/clothing/under/ties.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.dm
code/modules/mob/living/silicon/say.dm
code/modules/mob/mob_defines.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/pen.dm
code/modules/paperwork/stamps.dm
code/modules/projectiles/projectile.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/reagent_containers/glass.dm
code/setup.dm
config/config.txt
html/changelog.html
icons/effects/effects.dmi
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
maps/tgstation.2.1.0.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-23 00:23:37 +10:00
Kortgstation@gmail.com
b0077b3498
Removed nanoaugs, they were unbalanced and never used outside of badmins shitting things up.
...
They also added extra checks to
-Everytime a mob attacked (checking for super strength and electric hands)
-Every time a mob was attacked (checking for dermal armour)
-Every time a human was shot (checking for reflex)
-Every time a human breathed (checking for rebreather)
-Every tick of human life (checking for regen)
-Every hud update (checking for radar)
Not to mention just cluttered mob code in general. I know there won't be any noticeable performance increase from this but seeing as they were never going to be finished (I asked Doohl beforehand) and mob code is messy enough as is, I think only good can come of removing the code.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5587 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-20 10:45:20 +00:00
Cael_Aislinn
bdeb96b7e5
Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/ATMOSPHERICS/components/unary/vent_pump.dm
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/__HELPERS/game.dm
code/controllers/shuttle_controller.dm
code/datums/datumvars.dm
code/datums/supplypacks.dm
code/defines/obj/storage.dm
code/defines/obj/vending.dm
code/defines/obj/weapon.dm
code/defines/procs/command_alert.dm
code/game/area/Space Station 13 areas.dm
code/game/atoms.dm
code/game/gamemodes/changeling/modularchangling.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/dust.dm
code/game/gamemodes/events/miniblob.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/factions.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/jobs/access.dm
code/game/jobs/job/assistant.dm
code/game/jobs/job/captain.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/engineering.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/science.dm
code/game/jobs/job/security.dm
code/game/jobs/job_controller.dm
code/game/machinery/alarm.dm
code/game/machinery/atmo_control.dm
code/game/machinery/atmoalter/area_atmos_computer.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/computer/HolodeckControl.dm
code/game/machinery/computer/ai_core.dm
code/game/machinery/computer/atmos_alert.dm
code/game/machinery/computer/card.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/computer.dm
code/game/machinery/computer/message.dm
code/game/machinery/computer/pod.dm
code/game/machinery/computer/prisoner.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/constructable_frame.dm
code/game/machinery/doors/door.dm
code/game/machinery/doors/firedoor.dm
code/game/machinery/newscaster.dm
code/game/machinery/recharger.dm
code/game/machinery/spaceheater.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/logbrowser.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/machinery/teleporter.dm
code/game/machinery/wishgranter.dm
code/game/mecha/mech_fabricator.dm
code/game/mecha/working/ripley.dm
code/game/objects/items.dm
code/game/objects/items/blueprints.dm
code/game/objects/items/devices/flashlight.dm
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/uplinks.dm
code/game/objects/items/stacks/medical.dm
code/game/objects/items/weapons/cards_ids.dm
code/game/objects/items/weapons/gift_wrappaper.dm
code/game/objects/items/weapons/hydroponics.dm
code/game/objects/items/weapons/manuals.dm
code/game/objects/items/weapons/secstorage/secstorage.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/storage/firstaid.dm
code/game/objects/items/weapons/storage/kit.dm
code/game/objects/items/weapons/storage/storage.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/storage/uplink_kits.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/tools.dm
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
code/game/objects/structures/crates_lockers/closets/secure/security.dm
code/game/objects/structures/electricchair.dm
code/game/objects/structures/extinguisher.dm
code/game/objects/structures/watercloset.dm
code/game/objects/weapons.dm
code/game/turfs/turf.dm
code/game/vehicles/airtight/airtight.dm
code/game/vehicles/vehicle.dm
code/global.dm
code/modules/DetectiveWork/evidence.dm
code/modules/admin/IsBanned.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/diagnostics.dm
code/modules/admin/verbs/getlogs.dm
code/modules/client/preferences.dm
code/modules/clothing/masks/miscellaneous.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/clothing/suits/miscellaneous.dm
code/modules/critters/critter_defenses.dm
code/modules/detectivework/scanner.dm
code/modules/flufftext/Hallucination.dm
code/modules/food/recipes_microwave.dm
code/modules/mining/mine_items.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/dead/observer/observer.dm
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
code/modules/mob/living/carbon/alien/special/facehugger.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/say.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/silicon/ai/life.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/paperwork/clipboard.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/paperbin.dm
code/modules/paperwork/pen.dm
code/modules/power/cable.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/revolver.dm
code/modules/projectiles/projectile/change.dm
code/modules/projectiles/projectile/special.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/hypospray.dm
code/modules/recycling/sortingmachinery.dm
code/modules/research/designs.dm
config/config.txt
html/changelog.html
icons/mob/head.dmi
icons/mob/hud.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/mask.dmi
icons/mob/suit.dmi
icons/mob/ties.dmi
icons/mob/uniform.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/masks.dmi
icons/obj/clothing/suits.dmi
icons/obj/clothing/ties.dmi
icons/obj/grenade.dmi
icons/obj/projectiles.dmi
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-11 22:12:31 +10:00
Cael_Aislinn
990090326d
compile fixes and cleanup
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 02:36:52 +10:00
Cael_Aislinn
aae42d928a
Merge branch 'incremental_tg' r5200 into bs12_with_tgport
...
Conflicts:
baystation12.dme
code/__HELPERS/global_lists.dm
code/__HELPERS/type2type.dm
code/__HELPERS/unsorted.dm
code/datums/datumvars.dm
code/datums/disease.dm
code/datums/organs/organ_external.dm
code/datums/supplypacks.dm
code/defines/obj.dm
code/game/area/areas.dm
code/game/atoms.dm
code/game/gamemodes/cult/cult_structures.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/events.dm
code/game/gamemodes/events/ninja_equipment.dm
code/game/gamemodes/events/space_ninja.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/gameticker.dm
code/game/hud.dm
code/game/jobs/access.dm
code/game/jobs/job/civilian.dm
code/game/machinery/alarm.dm
code/game/machinery/cloning.dm
code/game/machinery/computer/cloning.dm
code/game/machinery/computer/medical.dm
code/game/machinery/computer/syndicate_shuttle.dm
code/game/machinery/telecomms/broadcaster.dm
code/game/machinery/telecomms/machine_interactions.dm
code/game/objects/effects/decals/contraband.dm
code/game/objects/effects/signs.dm
code/game/objects/items/devices/PDA/PDA.dm
code/game/objects/items/devices/PDA/cart.dm
code/game/objects/items/weapons/photography.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/window.dm
code/game/sound.dm
code/game/verbs/ooc.dm
code/global.dm
code/modules/DetectiveWork/detective_work.dm
code/modules/DetectiveWork/evidence.dm
code/modules/DetectiveWork/footprints_and_rag.dm
code/modules/DetectiveWork/scanner.dm
code/modules/admin/player_panel.dm
code/modules/admin/verbs/adminhelp.dm
code/modules/admin/verbs/adminpm.dm
code/modules/awaymissions/gateway.dm
code/modules/client/client defines.dm
code/modules/client/client procs.dm
code/modules/client/preferences.dm
code/modules/clothing/spacesuits/rig.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/mint.dm
code/modules/mining/ores_coins.dm
code/modules/mining/satchel_ore_boxdm.dm
code/modules/mob/living/carbon/alien/alien.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/human_damage.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/human/update_icons.dm
code/modules/mob/living/living.dm
code/modules/mob/living/say.dm
code/modules/mob/mob.dm
code/modules/mob/mob_cleanup.dm
code/modules/mob/mob_defines.dm
code/modules/mob/mob_transformation_simple.dm
code/modules/mob/new_player/login.dm
code/modules/mob/new_player/new_player.dm
code/modules/mob/new_player/preferences_setup.dm
code/modules/mob/new_player/savefile.dm
code/modules/mob/new_player/sprite_accessories.dm
code/modules/paperwork/folders.dm
code/modules/paperwork/paper.dm
code/modules/paperwork/photocopier.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/setup.dm
code/unused/mining/datum_processing_recipe.dm
code/unused/powerarmor/powerarmor.dm
code/world.dm
html/changelog.html
icons/effects/96x96.dmi
icons/mob/head.dmi
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
icons/obj/hydroponics.dmi
icons/obj/items.dmi
icons/turf/areas.dmi
icons/turf/walls.dmi
maps/RandomZLevels/fileList.txt
maps/RandomZLevels/spacebattle.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-01-07 00:23:22 +10:00
Kortgstation@gmail.com
0c4f441cb5
Added Cheridan's slime sprites to replace roros. Replaced all mentions of roro/metroid with slime. Once Cheri has the rest of the sprites/Phol gets mutant race sprites I'll start work on redoing metroid/slime code with Giacom and adding breeding.
...
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5223 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 04:12:22 +00:00