Commit Graph

166 Commits

Author SHA1 Message Date
Lo6a4evskiy
82f869c9a6 Updated to resolve conflicts 2014-09-06 13:34:43 +04: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
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
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
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
Aranclanos
fc915bf800 If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
Fixes issue #2236.
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
Ergovisavi
d55d72f049 Merge branch 'master' of https://github.com/tgstation/-tg-station into mineral_economy 2014-03-26 18:14:48 -07:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
MrPerson
ee716586b9 GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/objects/items/weapons/explosives.dm
2014-03-21 19:04:51 -07:00
Ergovisavi
d0ef73125a Various mining changes IE: mineral amounts per tile, mining mob stuff, mob anchoring, etc 2014-03-20 20:10:54 -07:00
Ergovisavi
57fe8ea3f4 Various mineral/material standardizations, minor mob changes 2014-03-19 18:28:56 -07:00
Giacomand
cc4dd68bdf Added a new gravity generator which will produce gravity for the station.
Sprites by Ausop, which he posted in his sprite thread.

The gravity generator is very sturdy, as it is almost indestructible, but explosions can break it and it will need repairs.
Changed C4 to stop del()'ing and instead will only use ex_act().
Added an interact_offline variable for machines that will allow you to interact with them even if they are depowered. The gravity generator only uses this at the moment.

Removed the stun that people get when gravity changes.
Shuttles have gravity still.

Added a gravity generator room to the west of Engineering. It is very secure, with a foyer and requiring CE or Captain access. There are instructions on the table for repairing and enabling/disabling the machine.
2014-03-15 16:59:48 +00:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
Ergovisavi
3a96098d55 Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
Also fixed some weird autodrobe runtime on startup
2014-03-02 17:07:24 -08:00
Ergovisavi
d2917b7992 Fixes an issue with teleportation scrolls and mining vouchers that allow you to gain unlimited uses from them. 2014-03-02 05:00:57 -08:00
Ergovisavi
05687e2490 Reduced the effectiveness of the resonator, resonator kit no longer has stimulant pills, lazarus mobs have attack_self 1 to not build an army of loyal mobs, as a wall of goliaths is too effective. Removed messaging admins for gibtontie deposits on the mining zlevel. Made the Superpacman generator a little more efficient. 2014-02-27 21:02:41 -08:00
Ergovisavi
83c85abe26 Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes 2014-02-25 17:38:24 -08:00
Ergovisavi
a4ffdf1cb7 Asteroid/Mining tweaks:
Adding mining GPS so miners can find each other more easily on the asteroid
Ore Redemption machine usability improved, also now only processes 10 ore per tick due to possible issues with mass processing of ores
Labor mineral rates edited to fall in line with the rest of the minerals, Labor stacker points increased to compensate
Treasure rooms should now spawn properly and start unlit, treasure items tweaked
Cargo points per plasma sheet significantly increased due to increased rarity
PACMAN generator made significantly more efficient to compensate for increased rarity of plasma, amount of plasma in engineering reduced as a result
Slight tweaks here and there of mining mobs in general
2014-02-25 06:03:17 -08:00