Commit Graph

66 Commits

Author SHA1 Message Date
oranges 134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
MMMiracles cde4df61ae conFLICTS 2015-12-16 06:26:54 -05:00
MMMiracles 401a947a08 fixes plasmaman corpse spawner, adds a comment about it using the typepath. 2015-12-12 23:54:00 -05:00
MMMiracles bf902bbe7c question answered, then. 2015-12-12 19:15:49 -05:00
MMMiracles a2d0086762 consistency is a virtue 2015-12-12 19:09:47 -05:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
AnturK 4db8386ebb Fixes pre-round sleeper activation 2015-12-07 19:36:28 +01:00
MMMiracles 81f6c450e5 fianl stuff for now, testing!!!!! 2015-12-06 14:32:10 -05:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
as334 ce9ea0ca46 FUCK THIS FUCK EVERYTHING 2015-11-26 22:22:07 -05:00
MMMiracles 671fa02edf almost there folks 2015-11-23 21:53:27 -05:00
duncathan salt 4a363b4363 Merge pull request #12910 from KorPhaeron/ghost_spawner
Ghost spawner naming fix
2015-11-23 20:02:53 -06:00
KorPhaeron 888fe9fb30 Default 2015-11-21 06:43:01 -06:00
as334 ef6af4ef5b Unfucking shit ass plasma memes part 1 2015-11-13 21:28:00 -05:00
MMMiracles 90c55718af conflict fix oh vey 2015-11-13 16:27:03 -05:00
MMMiracles d0356f2741 more map changes, misc edits 2015-11-13 16:16:57 -05:00
as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
MMMiracles 01742de97f another update, added some corpse spawners for map use. 2015-11-11 18:51:56 -05:00
KorPhaeron f8aba56a96 Better comment 2015-11-07 16:55:09 -06:00
KorPhaeron 4ef3a9332a Mob name fix 2015-11-07 16:51:31 -06:00
KorPhaeron 6a8919197b Flavour 2015-11-03 23:37:05 -06:00
KorPhaeron c87c06411f Ghost spawner 2015-11-03 23:25:36 -06:00
as334 202eefe635 Fixes the compile issue, adds myself to admin.txt 2015-10-25 14:45:18 -04:00
KorPhaeron 6af623a215 Update 2015-10-09 23:13:24 -05:00
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
xxalpha 55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
2015-03-27 19:35:10 +00:00
xxalpha edccabb0c4 Only engineering type hardsuits have the inbuilt jetpack. 2015-03-18 17:48:45 +00:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
xxalpha a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
paprka a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00
tkdrg 2607a456c0 Merge pull request #6634 from paprka/chefuniform
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
paprka e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -08:00
tkdrg cc474b2af6 Merge pull request #6591 from phil235/FingerlessSpriteFix
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
paprka 5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
phil235 b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
paprka 2371e2ebd8 renames chef to cook 2014-12-22 17:02:06 -08:00
paprka db6eabfc4e intial commit for syndicate hardsuit feature 2014-12-13 22:26:09 -08:00
paprka 3240cbea99 Tactical armor, etc 2014-12-12 00:23:16 -08:00
paprka 9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
paprka ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
paprka d80be7f689 changes robotics gloves to fingerless gloves 2014-10-08 05:11:30 -07:00
paprka 10f6ca8c7e removes swat helmet 2014-08-07 04:47:55 -07:00
paprka d992c907c6 goodbye rigsuits my old friends 2014-07-29 11:43:34 -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
Daniel 30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
MrPerson 917a2dd2a4 Rename equip_to_slot_or_qdel() -> del()
Still qdel()'s them, just naming the proc back.
Should hopefully reduce the number of lines different in the pr.
2014-03-02 21:08:25 -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
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 e33f91229b Gameticker checks for mind in end of game readout
This stops AI corpses showing up in the end of round report. It also
means that a ghosted (whether after death or by going catatonic) AI or
borg will now have its player shown at the end of the round.
2014-02-03 05:27:03 +13:00
Tenebrosity bcf075b394 Fixes #2553 and #2533
Fixes the away map dead slime spawner. Previously, it would spawn two
dead slimes that had living icons. Now it spawns one slime with a dead
icon.  These issues are fixed by adding a check for existing slimes at
the spawner's location before spawning a slime, and killing the spawned
slime via adjustToxLoss() instead of death(). Death() doesn't give the
slime a dead icon for some reason.

Fixes the away map dead AI spawner. Previously, it spawned a dead AI
that showed on the PDA messenger from roundstart, made the AI status
displays on the station show the BSoD, and displayed its laws in the
round-end report. These issues are fixed by setting the spawned AI's PDA
toggle to 1, changing the status displays back to blank after the AI
dies and removing the dead AI from the moblist so it isn't shown at the
end of the game.
2014-01-31 00:47:44 +13:00