Commit Graph

101 Commits

Author SHA1 Message Date
Tigercat2000 d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Fox-McCloud 7733df9e6b Asteroid Temp Change 2015-05-01 17:03:37 -04:00
Fox-McCloud b5fe239c24 Asteroid Temp Fix 2015-04-25 15:36:21 -04:00
Fox-McCloud 60d4038ed5 Comfy Mining Turfs? NO! 2015-03-04 17:56:30 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
ZomgPonies 554765f49a Merge pull request #342 from Fox-McCloud/MiningSounds
Mai Immershun
2015-02-20 07:42:34 -05:00
Fox-McCloud beae1bbe0f Mai Immershun
The hills are filled with the sounds of mining
2015-02-18 23:14:28 -05:00
Fox-McCloud a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Cael Aislinn 5439b04241 reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	code/global.dm
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
2014-06-20 08:13:42 -04:00
ZomgPonies 8b77070cbe Added new minerals and sprites to mining 2014-06-19 15:24:03 -04:00
ESwordTheCat bb54ac1ac4 Fix artifact spreading and large scanner. Remove extra list used the master_controller var again.
Conflicts:
	code/modules/mining/mine_turfs.dm
	code/modules/research/xenoarchaeology/misc.dm
	code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm
2014-06-19 10:33:50 -04:00
Jarcolr 4f20de625c Fixes #5255 and walking over edges
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-19 10:14:35 -04:00
Zuhayr ef59deb928 First pass on ore distribution map and stationary drilling rig.
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/modules/mining/coins.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/minerals.dm
	code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
Mloc-Argent 106fe78649 mining: fix for mining cooling down
Hacky thing that was already done to space. TCMB->T0C

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-05-31 10:39:20 -04:00
Cael Aislinn 18e3e37507 adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

Conflicts:
	icons/obj/hydroponics.dmi
	icons/obj/xenoarchaeology.dmi
2014-05-03 17:25:57 -04:00
ZomgPonies 5746c7b6d4 Balancing for mining 2014-05-01 00:13:46 -04:00
ESwordTheCat c43652b33a Okay shards converted to pool usage now.
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
2014-04-19 19:57:53 -04:00
ZomgPonies 347bce3c06 Gibtonite fixes 2014-02-28 19:16:34 -05:00
Rob Nelson 71c07e208a Improved creature AI and random mob spawning in caves.
Also equipment lockers.

Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
	code/modules/mining/materials.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/ores_coins.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	code/modules/projectiles/ammunition/bullets.dm
	code/modules/projectiles/guns/energy/special.dm
	compare_report_tg.txt
	icons/obj/device.dmi
	icons/obj/mining.dmi
	icons/obj/vehicles.dmi
	maps/tgstation.2.1.0.0.1.dmm
	maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
Rob Nelson 6ad3ca77f1 New stuff for mining
Conflicts:
	code/game/mining_surprise.dm
	code/game/objects/structures/wizmobile.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/minerals.dm
	compare_report_tg.txt
	icons/obj/mining.dmi
	icons/turf/walls.dmi
2014-02-16 03:54:39 -05:00
Rob Nelson c3b021e246 Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
And holy shit it's fast

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/pipes.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/rechargestation.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mining/mine_turfs.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/cable.dm
	html/changelog.html
2014-01-29 23:45:21 -05:00
SkyMarshal 0be7c1c9a2 Fix for mining.
Fixes #4249
2014-01-09 20:57:47 -05:00
SkyMarshal e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed.
Conflicts:
	code/modules/mining/mine_turfs.dm
2014-01-09 20:56:38 -05:00
ZomgPonies 3007803d07 Nerfed abandoned crates to be less fucking moronic 2014-01-01 16:18:56 -05:00
Iamgoofball 54f06a1d12 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-12-11 01:05:26 +01:00
ZomgPonies e93400e22e Fixes potential infinite loops with creating mine turfs 2013-12-06 19:52:11 -05:00
ZomgPonies 383b0c6f64 Clown Planet bugfixes 2013-11-21 06:44:37 -05:00
ZomgPonies 52907cdb23 Fixed and working clown planet 2013-11-21 03:03:04 -05:00
ZomgPonies 859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies 63677febbe More scoreboarding, more slot machining 2013-11-17 05:43:13 -05:00
ZomgPonies d31e276cf8 Final XenoArch Fixes (maybe) 2013-10-30 03:33:07 -04:00
ZomgPonies 28d8f6f738 Re-education campt for naughty players. Glory to Cyberiad! 2013-10-30 03:13:47 -04:00
ZomgPonies 2df877bf82 Xenoarch update 2013-10-29 11:56:04 -04:00
Peter Wall e716e66d10 Made mechas able to bump-mine 2013-07-25 15:40:03 +02:00
Cael Aislinn 6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:16 +10:00
Cael_Aislinn 6d03802c75 reduced the chance of safely extracting xenoarch finds without the proper process
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:08:30 +10:00
Cael_Aislinn 14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-31 01:29:19 +10:00
Cael_Aislinn 398bdafbbd runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 12:01:43 +10:00
Cael_Aislinn 1322ac469c removed rock spawn for ordinary miners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:49:50 +10:00
Cael_Aislinn 040cf2f8d5 tweaked artifact extraction, artifacts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:27:46 +10:00
Cael_Aislinn f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 21:59:50 +10:00
Cael_Aislinn 7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 13:28:31 +10:00
Cael_Aislinn bbfbfb0ca2 tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-13 12:23:20 +10:00
Cael_Aislinn b63bc43820 new sprites, reworked digspite spawning and geosamples to fit artifacts, misc tweaks (admin logging on syndie beacon, energy field)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-12 22:55:07 +10:00
Cael_Aislinn b2e9c265c4 new icons, added some large artifacts, renamed/restructured a bunch of files
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-10 01:30:40 +10:00
Cael_Aislinn 5533ef4946 setup digsite creation + propogation on mining asteroid, setup most excavation and tool interaction with mining turfs + digsites, setup tweaked list operation, modified dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-08 23:54:45 +10:00
Cael_Aislinn 651fa7a9f0 restructured tools, restructured/added archaeo finds, restructured how finds spawn in the asteroid, tweaked some mining stuff
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-04 23:40:53 +10:00
Cael_Aislinn 3f62e2a938 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/xenoarchaeology/artifact_effect.dm
	code/modules/research/xenoarchaeology/finds.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-02 17:05:27 +10: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
petethegoat@gmail.com 11b17c4442 Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.

Updated all maps.

I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.

Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 19:11:56 +00:00