Commit Graph

21 Commits

Author SHA1 Message Date
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
Hornygranny
cd22bfc11f refactors narsie to use the object oriented programming meme 2014-12-18 11:44:20 -08:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00
tkdrg
79e8ad4142 The singularity/narsie are no longer machines 2014-12-12 19:42:37 -03:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
paprka
5b6039a521 changes to the uplink and further c90 updates 2014-12-07 19:39:24 -08:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
paprka
726b939754 whole bunch of gun stuff 2014-08-07 14:39:31 -07:00
Jordie0608
b2641f9af6 Adds away missions to readme.md 2014-07-31 21:54:55 +10:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
Hornygranny
d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -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
1ff2cd3e92 Somehow the box away code file got unticked. 2014-03-03 05:47: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
Aranclanos
e5ba65bb78 Removes the away mission box2550 2014-02-19 06:53:15 -03:00
Tenebrosity
094c91dc49 Readds slime and AI corpse to box away
They now appear correctly, and without interfering with other parts of
the game.

Fixes turrets and their turnie offie things so they work.

Still to do: Readd window clue to bomb test area. Somehow it got removed
from the object's description.
2014-02-05 06:39:05 +13:00
Tenebrosity
fd8be7edc2 Updates box2550away (again) (again) (again)
Uses the map tools, but edits a lot of paths.

Makes box2550away unsimulated to combat lag
Adds three new unsimulated floors, which are just copies of simulated
ones
Adds four new unsimluated walls, which are just copies of simulated ones
Breaks telescreens as they don't work off the station
Adds the escape shuttle to the map as it has the penultimate HONK clue
paper on it and replaces the shuttle console with a fake
Adds a needed stat check to security camera computers
Gets rid of disposal overlays on box2550away toilets
Replaces box2550away status displays with fakes
Fixes a bug with entertainment monitors where they had no broken icon
due to being in status_display.dmi instead of stationobjs.dmi
Adds a carpet icon ("carpet2") that was present in 2010 and is used in
box2550away back to floors.dmi
Changes disposal related user messages so they refer to the name var of
the disposal object. This makes the messages refer to my disposal
toilets as toilets instead of diposals.
Removes the non-slip flag of SWAT shoes in the armoury.

God I hope I committed all the files I changed.
2014-02-04 20:30:13 +13:00
Pete Goodfellow
9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
Pete Goodfellow
d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
2014-01-21 21:50:32 +00:00
Mloc-Argent
2f931aefc8 Big(gish) map reorganization.
Moved all main .dmm maps to _maps/map_files
Each main map gets a .dm file in _maps, this is what's ticked, -NOT- the .dmm file.
This allows use of a MAP_NAME define for various purposes, and lays the groundwork for map customization in the future.

Also included a hacky dm.sh script which supports swapping maps.
For example, "./dm.sh tgstation.dme -Mmetastation" would compile with metastation.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-01-13 22:38:11 +00:00