Commit Graph

18 Commits

Author SHA1 Message Date
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07: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
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
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
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
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
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
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
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
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
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
AlexanderUlanH
16d17921f9 Cha-cha-cha-changes
Changed the shuttle controller to a datum, changed the appearance of the
labor shuttle, and fixed stackers giving one free stack of each ore.
2013-11-02 17:01:54 -04:00
AlexanderUlanH
87b72833bd Added the labor shuttle 2013-11-02 15:16:39 -04:00