Commit Graph

36 Commits

Author SHA1 Message Date
Rob Nelson
d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob Nelson
22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies
5ce256b73c Organ/Surgery Overhaul Part 1 2013-12-19 07:25:55 -05:00
ZomgPonies
227f4a1bc0 I guess slime people are now live. 2013-11-24 09:48:38 -05:00
ZomgPonies
13985d2f4f Sayu grenade and assembly update 2013-11-04 14:31:58 -05:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
f13d5db588 Blood dialysis 2013-10-20 20:01:28 -04:00
ZomgPonies
5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies
b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
ZomgPonies
c284cef185 makes bananades buildable 2013-09-14 13:36:55 -04:00
ZomgPonies
d20f88bf58 Added ghettobombs and bananades 2013-09-14 02:40:39 -04:00
ZomgPonies
653f8d4741 Cut disposal damage by half 2013-09-14 02:39:34 -04:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
SkyMarshal
7d114d22bd Fixes issues:
#2632 Fire Issues (Fire doors work, Flamethrower reverted to making a flamethrower liquid fuel subtype, flame grenades now make a puddle of welder fuel that is lit aflame with napalm)
#2630 (The code has been calling (turf).temperature_expose when it was supposed to be hotspot_expose), #1865 (aqain)(Added a check to remove trace gas fuel under a certain point).
Also: added a flashpoint value for plasma, which is the temperature at which it self-ignites (Currently 246C or 519K which is equal to gasoline)
Partial-tile firedoors now default to full-tile firedoors as the part-tile ones were breaking ZAS zones entirely.  Possible cause of #2627 and maybe #2451, but those need tested and I did not have time.
2013-04-09 00:49:19 -07: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
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
johnsonmt88@gmail.com
3f1fc2ef62 Reduced EMP grenade range.
- Traitor grenades: 10 heavy range and 20 light range is now 4 heavy range and 10 light range

- Chem grenades: Chemists can no longer make EMP grenades as powerful as traitor grenades unless they use two large beakers. They used to be able to make EMP grenades as powerful as traitor grenades, or twice as powerful with two large beakers. Now they make slightly weaker versions unless two large beakers are used.

- Updated the list of uplink items to show that EMP grenade boxes hold 7 grenades since someone forgot to change it.

- EMP grenade boxes cost 4 crystals instead of 3.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5222 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-29 02:20:09 +00:00
d_h2005@yahoo.com
ffe7bc7a90 -Adds scythes
-Adds weed control crates, orderable by cargo techs, for the purpose of kudzu control.
-You can now construct folders with cardboard sheets.
-Moves newspaper sprites out of weapons.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5206 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-27 02:20:20 +00:00
Kortgstation@gmail.com
95b109ff62 Ported hivebots over to simple_animal
Ported viscerators over to simple_animal 

Updated spawning grenades to match.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5180 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-24 17:02:12 +00:00
SkyMarshal
2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
SkyMarshal
70c2fb231d Fixed Security HUD issues, reinstated old grenade behavior, de-nerfed Polyacid 2012-11-04 16:17:35 -07:00
Ater Ignis
cbc31b9090 Adjustable timer for default grenades 2012-11-01 21:05:02 +04:00
Ater Ignis
e79df68ef3 added new assembled timer-igniter assembly and added that to default chem-grenades 2012-11-01 17:49:21 +04:00
Ater Ignis
72f3c70da9 primed grenades must not be disassembable easy 2012-10-28 11:20:42 +04:00
Ater Ignis
2acba34e11 fix of names in grenade 2012-10-27 19:48:48 +04:00
Ater Ignis
6337048aad updated grenades, now with remote control, proximity control and timer control for your choosing 2012-10-25 19:56:32 +04:00
Cael_Aislinn
dd538fd3c5 Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport
Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/wizard/veilrender.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/life.dm
	code/setup.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-10-22 20:15:05 +10:00
giacomand@gmail.com
6616314ca6 -Cleaned up Simple Animals by having a hostile class which will handle standard attacking, then the childs of that class can override the procs to do something different, if needed.
-Cameras won't shock you anymore, when cutting the power wire.
-Cultists cannot be gibbed by placing more runes that is allowed, instead it says no and to clear any unused runes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4926 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 01:31:41 +00:00
Erthilo
a88c318051 Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands. 2012-09-24 17:56:49 +01:00
giacomand@gmail.com
f39dd65748 -Added maintenance cameras. These are cameras which are located in maintenance, not only that but they have a 66% chance of not spawning. Leading to random blind spots in maintenance.
-Fixed large grenades, removed the reliability prob().

-Added maintenance cameras on the map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4642 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-07 09:33:10 +00:00
giacomand@gmail.com
c207124142 New item "camera assembly" that is dispensed from the autolathe. (700 Metal/300 Glass), deleted old grenade camera assembly.
It will construct a camera after doing the following steps:
Wrench it to attach it to a wall
Weld it to the wall with a welding tool (Welding Helmet Required)
Attach wires to the camera
Possible extra steps in order to create special cameras (X-Ray, EMP Proof, Motion) (You can have more than 1 special attachment, meaning it can be possible to have an EMP Proof, Motion, X-Ray camera)
X-Ray will need carrots (something for botanists) (this will possibly changed, well it will definitely carrots are weird)
EMP Proof will need solid plasma.
Motion will need a prox sensor.
Screwdriver the panel closed to complete the camera.

To deconstruct the camera, it would be not so difficult to disable but it will take a while to completely remove it:
Screwdriver the panel open
Cut all the wires, cutting the alarm wire is optional.
Weld it.
It is now a camera assembly again.

Gave the cameras wires to cut/mend/pulse. Random wires for every camera to make hacking it harder.
Focus wire. Will make the camera have a shorter or normal vision range.
Power wire. Will disable the camera. Pulsing will make it kick anyone who is viewing it through a security computer. Will give a tiny shock if not protected.
Light wire. Will disable the "Toggle Camera Light" that the AI has. Pulsing it will disable/enable it.
Alarm wire. Will warn the AI that a camera's alarm has been set off, when this wire has been cut/pulsed. Does nothing else. Should only triggered once, meaning.. setting off the camera won't set it off ever again..
Special wire. Will toggle the special attachment of the camera. Pulse toggles, cutting disables, mending enables.
Nothing wire. Does nothing, just here to add more wires and make guessing which wire does which harder. x 3

Placed extra cameras, I can't recall all the places but here are some.
Around solar array entrances
Around EVA
Around the security back maintenance door
Place an X-Ray camera in the Living Quarters.
Bartender back room
Virology living quarters
Chapel crematory
A camera on the outside of Telecomm's external airlock
X-Ray camera outside every escape pod station.
Inbetween toxins test site and the station(?) There's cameras there already
Inbetween viro and medbay i think ^ I mean inside maintalright
private study? (library back room)
engineering secure storage
X-ray camera in toilets (both of them)
Both maintenance access that you find between important areas (captain room, teleporter room)(HoP office, staff meeting
Custodial Closet
Surgery Observation
Atmospherics Maintenance
Infront of Atmos
mining maintenance
Kitchen cold room
Hydroponics Storage
Emergency storage (both)

Other Map changes
Add red phone in Cyborg Station
Add AI restorer to Cyborg Station room
Added some camera assemblies in the Cyborg Station, inside a crate!

TODO:

Get camera alarms to give the AI a link to press, to jump there.
Standardize wires or something. There's a lot of copy+paste..

OTHER:

With the new camera stuff I got rid of the default x-ray cameras. Though there still are x-ray cameras placed around, watching you sleep.

Added Lugar223's improved vending interface. http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=9586

Some runtime fixes.

Added a second buffer for Cyborg cameras. Hopefully it'll make freelook less laggy.
Increased the first buffer to 2 seconds.
Some tweaking to stuff.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4606 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:20:40 +00:00
elly1989@rocketmail.com
3cbbbd78ea Fixes an issue with smoke bombs calling the smoke effect set_up improperly
Supply_packs ow use paths rather than strings. This is because paths for some of the items have changed with recent updates which was causing the strings to become invalid, but the compiler does not check them. Now that they are paths, the compiler will warn you. Fixes a number of runtimes with supply_packs/shuttle. A number of items that were meant to spawn in supply crates that were affected by this now spawn again. (stuff like grenades, spray bottles, etc)

Added a damp rag to the janitorial closet.
Added ammonia to the hydro crate (removed 2 bottles of pest-spray and increased cost slightly to offset)

Moved explosion2.dm to WIP/carn/Explosion2.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4601 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 18:27:45 +00:00
giacomand@gmail.com
760a57c44d -Increased the range of the EMP grenade to 10/20.
-Added two more grenades inside the EMP kit.

-Made reagents, which react to turf, require a certain number of volume before affecting the turf. For instance, you need 5 units of Thermite on a wall now.

-Added an EMP pulse recipe. It will react immediately on the mixing of the required reagents, which are Uranium and Iron. A grenade with 50 units of Uranium and Iron will act the same as an ordinary EMP grenade, with 10/20 range. Less or more reagents will change the range.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4588 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-30 13:52:26 +00:00
johnsonmt88@gmail.com
d36387607f More file structure stuff.
- The folders themselves are now finished
- Next I'll go through each file and organize them
- Lastly I'll start pulling the object definitions out of /code/defines/ and put them into their respective files.

**Note to committers**
Make sure the .dme file updates when you update to this revision. If necessary delete the .dme and svn-update.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4546 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-26 01:20:02 +00:00