Commit Graph

479 Commits

Author SHA1 Message Date
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
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
hornygranny
cdc4d4f073 added coords to server log 2014-02-21 11:31:34 -08:00
hornygranny
6278f10817 Fixes #2783 2014-02-20 11:33:27 -08:00
Ergovisavi
1749d38d56 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
2014-02-16 19:36:48 -08:00
Ergovisavi
0c79888f32 Changed plasma to not spawn so often, but now shows up on analyzer ping and grants more points. Reduced effectiveness of "Window shopping" on the asteroid by surrounding random mineral turfs in no-chance turfs. Changed the mining locker's sprite to something else, courtesy of Jordie0608. 2014-02-14 18:30:19 -08:00
hornygranny
e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Ergovisavi
7d4b9ac173 Asteroid Overhaul - Added explosions activating Gibtonite, revised ore redemption and equipment locker code, added warning signs to the western asteroid, tweaked mob spawning a little 2014-02-11 15:21:38 -08:00
Ergovisavi
892ffd3879 Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul 2014-02-09 22:37:20 -08:00
Ergovisavi
bf17c3328e Asteroid Overhaul v1.0
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
2014-02-09 19:51:05 -08:00
Ergovisavi
0c0fb58628 Some mob tweaks, ghetto smelting, equipment locker item fixes and changes 2014-02-07 20:45:06 -08:00
Ergovisavi
62ede5d1ae Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
2014-02-07 00:18:45 -08:00
Ergovisavi
a43ccac681 Makes SmeltMineral() less horrible actually adds the Mining Equipment Locker and Ore Redemption Machine to the map. 2014-02-04 16:58:26 -08:00
Ergovisavi
96f0f4f8b9 Makes SmeltMineral() less horrible actually adds the Mining Equipment Locker and Ore Redemption Machine to the map. 2014-02-02 18:03:47 -08:00
Ergovisavi
4d8674bffe High mineral chance turfs have been dotted throughout the asteroid instead of in small clumps.
High Mineral chance turfs and Labor minerals turfs are now color coded for your convenience in mapping, they go back to the default rock icon on new()
2014-02-02 13:56:00 -08:00
Ergovisavi
3c0493d2a9 Stops being able to power machines on asteroid turf
The west fields on the asteroid have been filled in, and the high mineral chance tiles have been redistributed throughout the asteroid.
2014-02-01 22:14:40 -08:00
Ergovisavi
a270bb5696 Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
2014-02-01 17:11:21 -08:00
Ergovisavi
2fe7961f95 Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
2014-02-01 14:24:31 -08:00
Razharas
b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +04:00
Ergovisavi
2133f12dc4 Merge branch 'master' of https://github.com/tgstation/-tg-station into miningpoints 2014-01-30 16:37:37 -08:00
Ergovisavi
bd3c9dea0a Fixes a possible runtime with gibtonite deposits. 2014-01-29 18:10:21 -08:00
Ergovisavi
b7eb807f34 Stops the admins from getting spammed from gibtonite, but is still logged 2014-01-29 15:54:10 -08:00
Ergovisavi
e766b585c1 Equipment Locker and Ore Redemption Unit v1.0 2014-01-29 11:47:34 -08:00
Razharas
ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Ergovisavi
c1fa50976b Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-20 17:48:38 -08:00
Aranclanos
470e323fda Mineral boxes will now handle properly the movements of the mineral ores when a player click on them with one.
Fixes issue 2352
2014-01-15 20:08:35 -03:00
Ergovisavi
4948820b67 Gibtonite - Uncommited the .dme changes, fixed countdown(), removed redundant checks 2014-01-11 12:47:30 -08:00
Cheridan
26d3d03d69 Merge pull request #1906 from Aranclanos/GiaPlsFix
Removed the need of input and output objects for the mining machinery
2014-01-05 14:23:28 -08:00
Aranclanos
b5fc39236f changes strings to paths on the mining machinery code 2014-01-03 03:23:28 -03:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Giacomand
02a1e9bd0f * Increased the amount of iron that spawns in the labor camp.
* Decreased the amount of points you get from diamond and bananium. Increased the amount of points you get from Iron and alloys.
 * You can now see which minerals give you which points from the claiming console.
2013-12-23 22:26:36 +00:00
Giacomand
47545f439e * Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
 * Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
 * When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00:00
Rolan7
530dd03286 Making astroturf and sandstone now automatically stacks all the produced items. 2013-12-04 18:44:49 -05:00
Rolan7
e3d2f9ffe7 DONE Leather gloves now have heat protection like black gloves (to allow removing lights bulbs/tubes)
DONE	Plants require 4 light, mushrooms only 2
DONE	Harvesting should report how many items were harvested (whether plantbag is used or not)
DONE	Plantbag should have a mode to only pick up one kind of plant at a time.  Trash and ore bags too.
DONE	1 unit of mutagen should cause non-species mutations.  (Radium too)
DONE	Uranium should be like radium but even weaker
2013-11-28 23:07:50 -05:00
Aranclanos
00a62742b6 Removed the need of the input and output object for the machinery of mining.
They will now use the input_dir and output_dir vars.
2013-11-26 09:12:21 -03:00
Aranclanos
4ad564a440 gia ;_; 2013-11-26 05:56:58 -03:00
AlexanderUlanH
b66d64ea9e Re-beautified mining
Caves now update properly, with no inconsistent overlays on space tiles.
2013-11-10 00:09:57 -05:00
AlexanderUlanH
f31f7092c8 [MAP] Mining fixes and a remap
I don't even know what's going on oh god
2013-11-06 23:26:46 -05:00