Commit Graph

479 Commits

Author SHA1 Message Date
Jordie0608
40e0a52283 Repaths clown ore to bananium 2014-09-19 21:26:50 +10:00
Perakp
4efdf2036c Removes the message for when no ores were detected & slight re-organization. 2014-09-18 20:35:45 +03:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
Aranclanos
53f48fa599 Cleaned up the turf Entered() procs:
-Removed check for infrared beams. (it checked each time that anything moved)
-Removed 'movement_disabled' check, the verb is also completely removed.

For space Entered() turfs:
-Removed check for meteor
Now meteors and immovable rods will use the same proc to determinate their start and finish, while moving they'll check in which z level they are, deleting themselves if they leave it.
-Removed spawn() to move objects being pulled between z levels
Replaced the step() from mob pulling movement code and replaced them with Move()

For asteroid Entered turfs:
-Removed check for mining cyborgs, now it will be next to the janitor borg check to clean the floor.

Mecha code got a small clean, removing the Entered() calls from there.
2014-09-15 03:26:58 -03:00
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Perakp
1a6523cb93 Mining scanner now works with ripleys. 2014-09-12 14:46:31 +03:00
Perakp
3a3f703ed9 Mining scanner scans automatically, similar to t-ray scanner.
Cooldown increased for balance/ to not have the flashing ores be too annoying.
2014-09-08 15:00:37 +03:00
ikarrus
20e337f8c4 Labor Camp Quotas
- Caps labor camp quotas at 1000 points (the equivalent of 10 minutes in the brig)
- Adds a line explaining the conversion rate between points and minutes
- Removes erroneous information that claimed zero point quotass equalled to unlimited
2014-09-07 18:42:46 -06:00
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
Alex
cec103fa21 Merge pull request #4454 from Ikarrus/plasteel
Ore Redemption Machine can now Smelt Plasteel
2014-08-24 13:05:12 +01:00
Firecage
dac8669166 Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork 2014-08-23 10:13:21 +02:00
MrPerson
13b03a6d43 Hopefully final pass of object -> mob examine switch 2014-08-20 07:07:30 -07:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
Alex
196f861efb Merge pull request #4441 from Ikarrus/brigtimer_notice
Brig cells and Labor Shuttle will notify SecHUDs on release of a prisoner
2014-08-19 10:32:50 +01:00
ikarrus
6444ae871b -Sechuds are notified when a prisoner has met his quota and moved the shuttle back on station. This is to let security know that there are minerals available, and that they should pick up the filled prisoner ID from the console
-Shuttle points console will no longer open the release door while the shuttle is still on the labor camp dock. This is to prevent players from being trapped on the bottom half of the shuttle, as they're unable to reach the console again to move the shuttle
-Added a points checking machine on the labor camp to raise awareness that there usually IS a quota that will release you when met
2014-08-16 15:16:56 -06:00
ikarrus
7a988c6497 Removing a premature return 2014-08-16 10:09:37 -06:00
ikarrus
c118f8a3ce Ore Redemption Machine can now Smelt Plasteel
We've been seeing plasteel production plummet to basically zero simply because the only way to do it was via the production line that:
A) Is sealed off with wooden barriers and
B) Does not give any point rewards
2014-08-15 19:25:50 -06:00
Alex
74c22755be Merge pull request #4365 from paprka/fingerlessgloves
Adds fingerless gloves, other glove related changes
2014-08-15 08:03:37 +01:00
Swag McYolosteinen
681990a835 Merge pull request #4364 from scoopscoop/sciencemineralnotice
Ore redemption machine mineral availability notice
2014-08-12 22:22:36 +02:00
scoopscoop
b14535344b Rewrote request console code to use a proc when generating a message on a target console
Redemption machine now sends a message to chemistry, too.
2014-08-12 13:56:02 +03:00
Alex
d5e578c6aa Merge pull request #4356 from paprka/minerals
Asteroid mineral turfs rates and rescaling
2014-08-11 14:03:11 +01:00
scoopscoop
9d47d2c98e Now uses a proc that generates messages on target console
Basically gutted topic code.
2014-08-07 18:38:09 +03:00
paprka
3b00fa9cfa cargonia strong! 2014-08-07 05:51:27 -07:00
scoopscoop
98739e8510 This sounds better 2014-08-07 15:12:17 +03:00
paprka
6770f6fdda second rates 2014-08-07 00:02:03 -07:00
Firecage
88be87e8d3 FUCKING ABSOLUTE PATHS 2014-08-06 15:15:56 +02:00
scoopscoop
6816f4cd5c The ore redemption machine in cargo now sends a message to the science department through the request console that new minerals are available 2014-08-06 13:33:57 +03:00
scoopscoop
19a5573cbf woo 2014-08-06 13:32:21 +03:00
paprka
64b8e99f0f initial 2014-07-29 08:05:52 -07:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures.
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
Cheridan
1e7a737a06 Merge pull request #4145 from Ergovisavi/faction_check
Changes faction to list
2014-07-22 19:10:53 -05:00
unknown
0ebb633a16 Mining Machines: Implementing ex_act()
Implemented ex_act() in both the ore redemption machine and the mining
vendor. Sparks were added as a feedback for any explosion that call
ex_act() on these machines.
To allow for the reconstruction of these devices, I have implemented
machine recepies and circuitboard definitions for these devices. I also added
R&D recipies for the circuitboards.
Offline and Open icons have been added for both objects.

Squashed all of my previous commits and fixed the leftover garbled code
from my original rebase.
2014-07-20 01:11:06 -04:00
Ergovisavi
ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
Alex
2830c8c092 Merge pull request #3961 from paprka/ergoisbackohno
Improved mining droprates
2014-07-07 10:28:30 +01:00
Miauw
71e1b38eb5 Adds slot machines. 2014-07-03 19:50:22 +02:00
paprka
2161273c79 better 2014-06-20 03:17:57 -07:00
paprka
1d2ae48cf3 initial 2014-06-20 03:13:27 -07:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
MrPerson
645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
2014-06-09 01:50:44 -07:00
Alex
f66253020e Merge pull request #3651 from Cheridan/areaSounds
Area Ambiance Refactor
2014-05-14 11:04:02 +01:00
fleure
e13ab9422d Merge pull request #3610 from Aranclanos/washingmachine
Washing machine fixes
2014-05-13 16:55:26 +01:00
Cheridan
a392da16b0 Area Ambiance Refactor 2014-05-06 21:40:28 -05:00
Jordie0608
6530150120 Changed mining equipment locker to mining equipment vendor 2014-05-06 20:01:01 +10:00
MrPerson
9d9a657acf Change examine() from an atom verb to a mob verb
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
2014-05-01 09:56:39 -07:00
Aranclanos
b544a945a9 Fixes issue #2489
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
Ergovisavi
f302adc8ab Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-04-16 16:58:28 -07:00
ikarrus
ae4a5482f0 Mineral Storage Access
Mineral Storage gives you access to the ore redemption machine, instead of keeping a list of req_one_access for various jobs. The intention is to make it easier to manage accesses and make it more clear who could use the machine.

Miners and their superiors now have access to the machine. If this becomes an issue I can adjust it.

Relabeled Mineral Storeroom access to Mineral Storage since the storeroom doesn't exist any more.
2014-04-06 15:40:46 -06:00
Miauw62
95733ee3ea Merge pull request #3280 from MrPerson/mining_vouchers
Fix the "use mining voucher many times" bug
2014-04-05 19:00:35 +02:00
MrPerson
157818b9b0 Fix the "use mining voucher many times" bug 2014-04-02 07:56:03 -07:00