Commit Graph

37 Commits

Author SHA1 Message Date
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
iamgoofball
4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07: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
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
b5df09de18 new xenoarchaeology icons/overlays
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-08 23:47:00 +10:00
Cael_Aislinn
0efb0311e3 removed misc file, added some extra sprites, added/tweaked list helpers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-04 23:37:50 +10:00
Mij
4166ae3e3f Xenoarch: artifacts, strange rocks, pretty orebox
Artifacts and strange rock formations spawn during world gen. Frequency
may need tweaking.

Strange rocks melt when acid hits them due to what I assume are changes
/tg/ made with how acid works. Alternately I missed something during
copypasta spree. I'll muck with it later. For now, harvesting always
works with applied welding tools.

Ore boxes back to old beautiful selves. Re-added a few icons to
mining.dmi and the strange rock icon to turfs.dmi
2012-10-24 12:38:46 -07:00
Kortgstation@gmail.com
29a6891009 Removed a ton of old and unused icons. Full list below.
Removal list


-------------Removed entirely-------------
walls48.dmi
speechbubble.dmi
AF.dmi
airtunnel.dmi
dam_mask.dmi
flags.dmi
human_unused.dmi
mouse.dmi
old_or_unused.dmi
old_or_unused_food.dmi
organs.dmi
suit_nosides.dmi
tajaran.dmi
tajaran_face.dmi
title_unused.dmi
uniform_fat_nosides.dmi
uniform_nosides.dmi

----------cyrogenics2.dmi---------
canister connector_0old
sleeper_0old
celltopold
celltop-pold
cellbottomold
cellbottom-pold
freezerold
cellconsoleold
cellconsole-pold
sleeperconsoleold
coolant-corig
plasma-corig
oxygen-corig
canisterconnectorold
celltop_1old
freezer_0old
freezer_1old
securitycamera
sleeper_1old
scanner_1old
scanner_0old
restruct_1
restruct_0
coolant-c
oxygen-c
plasma-c
canister connector_0
canister connector

---------decals.dmi---------
secureareaold
redcross_old (also better)


----------food.dmi------------
saltshaker
peppermill


--------harvest.dmi---------
wheatOLD
blueprintsWIP


------items.dmi------------
shard-glass
old_rods
old-sheet-metal
old-sheet-plasteel
old-sheet-glass
old-sheet-rglass


------------library.dmi----------
bigscanner-old
binder-old
cooked_book old


-------mining.dmi---------------
drill_off
drill_on
sprayer
smelter
smelteron


--------projectiles.dmi--------
plasma
u_laserold
plasma_2


-----robot_parts.dmi-------
l_arm_old
r_arm_old
l_leg_old
r_leg_old
chest_old
head_old
l_arm+o_old
r_arm+o_old
l_leg+o_old
r_leg+o_old
chest+o_old
head+o_old
robo_suit_old


-------------singularity.dmi------------
emitter_old
emitter_+a_old
field_gen
field_gen+a1
field_gen+a2
field_gen+a3
collector
collector +p
energything


--------stationobjs.dmi-------------
portalb
portal1b
igniter1Old
igniter0Old


-----------toy.dmi------------
caps-0
caps-1
caps-2
caps-3
caps-4
caps-5
caps-6
caps-7
toysword0
toysword1


-----------weapons.dmi----------
legacy_stunbaton
legacy_stunbaton_active
bucklerOLD
dice-old


---------------wizard.dmi-------------
dontknow


--------------particle_accelerator.dmi-------------
end_cap_old_old
end_cap_old
emitter_center_old_old
emitter_center_old
emitter_left_old_old
emitter_left_old
emitter_right_old_old
emitter_right_old
power_box_old_old
_old
fuel_chamber_old_old
fuel_chamber_old
control_box_old_old
control_box_old


-----------floors.dmi--------
oldburning


---------shuttle.dmi-------
burning


--------walls.dmi----------
gradient
burning
rock_Macguffinite
oldwallweld
oldwalldent

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4361 316c924e-a436-60f5-8080-3fe189b3f50e
2012-08-10 20:53:42 +00:00
sieve32@gmail.com
834b9f98d1 TIME FOR CONTENT
-New item, the Sheet Snatcher. Picks up mineral sheets (Excluding wood and sandstone, since they aren't 'sheets' per se). Standard one holds up to 300 sheets, minerborgs get 500. Will hold any combination of sheets, and auto-stacks them when emptied, works similarly to the ore satchels
-Mech drills can mine sand, with diamond drills getting an extended volume
-Mech Diamond Drills will drill through rwalls again, but it is pretty slow, sometimes taking 5-6 tries just to get the plating off
-Mining Ripleys no longer runtime to hell when the status panel is opened
-Fixes Issue 572, now when floors are created, they assimilate air from nearby tiles, so if it's in space, there will be no air, etc...
-Bumping an asteroid wall as a human or borg with a pickaxe in your hand will make you automattically start mining the wall, feels MUCH faster due to ignoring click_delay()
-Miner borgs with the satchel in their active modules will automatically scoop up the ores
-Clicking an asteroid turf with the satchel will function just as if you clicked on an ore (if any are present)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3867 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-19 02:46:29 +00:00
petethegoat@gmail.com
2a5f2dfda9 Removed the mint.
Coins can still be found and used in vending machines.
PACMANs now run off sheets instead of coins.

Added coolity's new orebox sprites.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3178 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-23 19:32:54 +00:00
uporotiy
f841d0eda6 Better sand sprite.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3147 316c924e-a436-60f5-8080-3fe189b3f50e
2012-02-18 17:52:30 +00:00
vageyenaman@gmail.com
bce6042fb7 Bugfixes:
- Laser cannons / Heavy laser cannons should now not be all mixed up.
     - Fixed a bug where the station heads and security crew could be revolutionaries and cultists on game start.
     - If you somehow drop the "Off Hand" that appears if you equip a fire axe, it will be deleted. No more silly "Off Hand" items lying around the station, yay!
     - If you threw a fire axe when it was wielded, it would would stay wieled.
     - Metroids should now, theoretically, not be able to phase through thin windows and glass doors. There's probably still going to be some Metroids phasing through thin glass doors if the right circumstances are met (BYOND pathfinding problem, will eventually migrate Metroid pathfinding to SS13's A* system.
     - Fixed up some of Firecage's half-assed sprites. The decloner projectile in specific.



Misc:
     - Portable turrets can now be equipped with EVERY (except the "plasma gun" because it's stupid anyway) energy gun possible. I want to see laser cannons turrets, emagged energy crossbow turrets, and shock revolver turrets, people!
     - The decloner is no longer called "decloner" because that term really doesn't make any sense anyway. Does it imply that everyone in existence is actually a clone? While that does sound kind of cool, it's actually pretty stupid, so I changed the name but kept the path type "/obj/item/weapon/gun/energy/decloner".

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1936 316c924e-a436-60f5-8080-3fe189b3f50e
2011-07-26 22:59:37 +00:00
tronaldnwn@hotmail.com
6b3476ed20 Syntiflesh update:
- Syntiflesh is going to be used in surgery to give people new faces.
- syntiflesh can be used in any recipe that requires normal meat.
- syntiflesh is made from 5 units of blood and 1 unit of clonexydone.

Plasma as a catalyst
-5 units of Plasma will be required as a catalyst in: Dexalin, Clonexydone, and Lepozine (requires copper as reagent now).
-NOTE: Catalysts are not consumed in reactions!

Clonexydone and cryoxydone
- result per reaction is three (it used to equal 10 per 3 unit reaction, that made no sense).
- Cryoxydone remove a slight amount of cloning damage at 170K.

Drinks 
- 4 new drinks! Atomic Bomb, 3 mile island ice tea, patron, and goldschlager!
- Look in the recipe code for how to mix each of them up.

Sprites:
-Added new Ore sprite for uranium, by Aru
- Drink and bottle sprites by Aru
- Manipulated Atomic bomb (drink) sprite from Aru and me.
- Unused yellowcake sprite (I need to tweak it a little more)

Food 
-Stream lined some food (removed WATER Reagents)
- Modified the nutriment value of other foods based on ingredients.
-Remember, Amanita is a poisonous mushroom! And, food made from it is also toxic.

Several new and exciting items added to reagent grinder:
-Bananas, carrots, liberty caps, chili peppers (ice too), and nettles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1742 316c924e-a436-60f5-8080-3fe189b3f50e
2011-06-30 07:24:33 +00:00
uporotiy
26e33a0a3c A couple of small changes before I tackle the buffing-up project.
Luminosity
Admins editing the luminosity var now properly uses sd_SetLuminosity().
 Britcup
A cup spawns for Kingston in hydroponics.
 Taser guns
New sprites, courtesy of Arcalane. Now with an actual 4-shot gauge!
 Interface
16x16 mode re-enabled for shits and giggles.
 Mining
Reverted the uranium ore sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1507 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-29 14:27:49 +00:00
tronaldnwn@hotmail.com
2456941fc7 New Uranium Ore icon.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1480 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-20 22:01:19 +00:00
noisomehollow@lycos.com
e55521799a #Fixed all known bugs with ninja voice.
#As an added bonus, voice-changers will protect from flash. Can be easily removed if needed.
#Added more recharge locations for ninjas: cells, smes, and cyborgs.
#Recharge changed so that it takes less time but recharges for less.
#Adamantine sprites per request.
#Updated Ripley sprites per request(?).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1444 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-14 18:20:20 +00:00
bizarre.babel@gmail.com
162014c7f9 Fixed the missed line with captain armor slowdown.
Plasma ore sprite, refined plasma ore sprite, and proper silver ingot sprite added thanks to matty.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1422 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-08 22:12:46 +00:00
tronaldnwn@hotmail.com
0e042a0e57 Added Matty's bad ass gold/ silver/ iron ore sprites.
Perhaps he will give us some bad ass gold bar and silver bar sprites too? *cross fingers*

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1414 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-07 23:16:13 +00:00
bizarre.babel@gmail.com
184ff2e4a9 Satchel returned to a cleaned up version of the old sprite.
Bananium ore now looks like the other ores, inspiration drawn from the plasma ore. Refined bananium is a gem, and more symmetrical than the previous version of that sprite. 

Shovel head is a shovel head based on an actual real shovel used to move coal and dirt in mines and not a spade head used for breaking ground in gardens. 

Jackhammer handles more solid-looking. 

Consolidated the pick sprites. Upgraded picks have only one point to differentiate their silhouettes. Separate sprites for the detached heads provided, as per the original intention of the one who was coding the research path. Sprites also added for pickaxe heads made of plasma crystal and uranium, which are about as rare as silver or gold, but not obtainable at the start of the round and make slightly more sense as mining heads than the soft, decorative metals. Plus rule of cool says a uranium mining pick is better.

Jackhammer in hand sprite (which shouldn't exist, since jackhammers are for cyborgs) changed to more accurately reflect what the jackhammer obj icon looks like.

All pick in hand sprites changed to reflect how the pick obj icons look. In hand icons added where needed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1368 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-04 19:52:00 +00:00
tronaldnwn@hotmail.com
8de3b7c62d Found a half decent backpack sprite from the Tibia game.
I thought it would make a great ore satchel sprite. All credit to the spriters for Tibia, they have nice item sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1342 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-02 11:53:51 +00:00
bizarre.babel@gmail.com
c15820fca3 Gigadrill sprite changed in preparation of its impending facelift.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1328 316c924e-a436-60f5-8080-3fe189b3f50e
2011-04-01 03:45:18 +00:00
baloh.matevz
2b08d73a7d REINFORCED WINDOWS standardized.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1077 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-20 16:38:00 +00:00
bizarre.babel@gmail.com
cce5fcf56a Golem added to genetics. Fat sprite exposes liquid rock underbelly.
National flags removed from flags.dmi (do we even use anything from this dmi?)

Aradia gimmick sprite has slightly more directionality.

Gigadrill has slightly more directionality.

I tried to change the collector sprites but looking at them makes me sad so I didn't.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@976 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-07 03:20:14 +00:00
baloh.matevz
cad7f87a16 MINING UPDATES:
- Fixed the mint
- Please report any additional bugs
- Added money bag item which can hold coins. Can't remove them at the moment tho.. whoops... forgot that

MAP UPDATES:
- added mint between crew quarters and detective's
- moved mining shuttle dock a step forward
- Removed the mint from mining outpost
- Added cammeras to mining outpost, CE's office and mining shuttle dock

ICONS:
- Added new smelter icon (it's a WIP but still better than the old one... SPRITERS!!!)
- Added mining console icons. I like these ones to be honest...
- Changed a tile to a floor in maintenance between mechbay and toxins
- REMOVED DOUBLE LOCKING DOORS TO ENGINEERING
- Made the flashlight in right main solars spawn above the air scrubber... (i only found the flashlight was there a few days ago)
- Moved the location of the ships for the shipbuilder to the clown z-level

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@958 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-04 07:50:24 +00:00
baloh.matevz
5af6ed1597 mining floors and walls now respond to explosions. Large explosions cause a lot of lag tho!! badmins, you have been warned! Some mint related changes and temp graphics put up for the ore box and ore satchel. Not much else to say. A map update will come in a moment.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@835 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-12 19:10:57 +00:00
uporotiy
16822a16bb Added a full set of sprites for clown ore (probably only gimmick or clown planet stuff, but eh).
Changed the shovel and pick sprites to look less rusty.
There are now coin sprites for every mineral.
Changed the silver, gold and diamond sheet sprites to look less messy, though I'm not completely happy with the result.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@822 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-09 13:57:29 +00:00
baloh.matevz
1bacbd80f3 Mining updates, mostly related to the production conveyor belt
Unloading unit:
- place ores, items or ore boxes there for them to get unloaded

Processing unit:
- now it works as intended

Stacking unit:
- finally made the code for it

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@817 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-08 23:17:51 +00:00
uporotiy
36c9325f13 More mining sprite changes. Changed the look of all the ores in wall form, changed solid plasma to be a semi-transparent crystal.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@809 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-08 02:41:27 +00:00
baloh.matevz
41e17aa313 added fire closets to spawn around the station. Each emergency closet has a 1/3 chance of changing to a fire closet. Lots of updates to mining, added satchels which can carry 10 pieces of ore each, they can gather all the ore from a tile at once or one at a time. They can get loaded into ore boxes, which can carry an unlimited amount, currently. Rail cars move much faster now, but demand more processor time, they will eventually get the role of getting loaded from satchels and producing ore boxes. Simply to make it easy to carry around hundreds of pieces of ore. (resubmit)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@799 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-07 12:05:33 +00:00
uporotiy
4975c39cd6 Changed the ores' sprites a bit (improved, right). Plasma ore is now purple because plasma is purple in this game. We'll see how the black outline looks ingame.
Added a default mining.dmi sprite for easier noticing of stuff with no sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@783 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-05 13:35:07 +00:00
baloh.matevz@gmail.com
afeabe8a77 Removed the ore icon from mining.dmi.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@778 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-04 17:22:05 +00:00
uporotiy
35545b67d8 New railroad sprites.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@777 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-04 16:49:29 +00:00
bizarre.babel@gmail.com
cf602912c9 Changed the placement of mining drill to be easier on the coders.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@776 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-04 14:42:54 +00:00
daelith.rhedynfre
0b69512b72 Sprite fixes for mining.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@761 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-03 22:29:44 +00:00
only.lurking
662c08272a git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e 2010-08-23 14:29:20 +00:00