Commit Graph

60 Commits

Author SHA1 Message Date
Bjorn Neergaard f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
YotaXP 2ffc5f055c Fixed bad origin_tech values. 2015-11-05 15:32:25 -05:00
xxalpha 22474094ae Merge remote-tracking branch 'upstream/master' into hot_or_not
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-09-24 03:14:04 +01:00
xxalpha 655b1a77c7 Replaced refactored is_hot() to be an atom proc. 2015-09-24 01:12:38 +01:00
c0 8d54f835ae Materials - final solution 2015-09-22 00:18:37 +03:00
Fox-McCloud 9b668de7bb Merge remote-tracking branch 'upstream/master' into Impropermaterials 2015-09-13 08:58:40 -04:00
Fox-McCloud ffa823e5b9 floor tile materials fixup 2015-09-12 16:11:48 -04:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Cheridan 2df4cdb7cd Thank you Remie for catching this intentional error.
Removes amount = 30
2015-08-09 23:07:24 -05:00
Cheridan e6fe8baa24 Astral Tiles 1.01 - Fun Removal 2015-08-09 23:02:32 -05:00
Cheridan 63698004d6 Fixes Conflicts, Also Structural Code Stuff 2015-08-08 20:16:53 -05:00
Cheridan eb210ab6e8 Adds Astral Carpet Tiles 2015-08-05 23:46:49 -05:00
MrPerson b0d511eff2 Automatic stack merging
When a stock moves onto the same tile as another stack, they merge together. Unless it was being thrown, in which case no, they don't merge. Unless the stack was the original target to begin with, then yes, they do merge.

Just a convenience feature. The one downside is that crowbarring up a floor tile won't merge with other tiles on the floor, but if someone makes that event call Move() like it's supposed to, it should work fine. That would just be out of scope for this PR.
2015-08-01 10:34:50 -07:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
xxalpha e7a90863b7 Repath grass. 2015-07-08 02:06:14 +01:00
xxalpha 5a5372ed96 Repathed carpet, and other shit I forgot. 2015-07-07 23:01:13 +01:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Ikarrus 8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos 3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
Firecage 3c69773a6c changes usr to user and adds another check. 2015-01-18 19:34:51 +02:00
Firecage 6e8fdc8b57 A fix so mineral floor tiles can be reshaped into mineral sheets. 2015-01-17 23:55:25 +02:00
phil235 22e0771eb9 Fixes more span classes. Replaces some "for() show_message()" with "visible_message()". Adding a suicide message for slimes. Fixes simple_animal/corgi having two attackby procs. 2014-11-28 16:08:59 +01:00
tkdrg ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
2014-11-12 22:50:32 -03:00
xxalpha b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
tkdrg 0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
tkdrg cd5720b6a7 Floor refactor, try #1 2014-10-19 16:48:35 -03:00
Remie Richards a9d609bc9b Merge pull request #4802 from Menshin/stacks_merging_cleaning
Crafted stacks merging cleaning
2014-09-24 12:04:07 +01:00
Menshin 9ae4e3650c * prevented empty stacks from being generated on tiles, when merging stacks on floor after crafting them (e.g metal => floor).
Fixes #4775
* various clean-up of unnecessary checks related to stacks
2014-09-13 00:38:39 +02:00
Firecage aab99e8825 Fixes what Miauw said 2014-09-06 15:19:58 +02:00
Firecage 38beaaf75c Updates 2014-09-02 01:24:54 +02:00
Firecage 834f9a05b9 Mineral flooring 2014-08-31 17:12:17 +02:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
Kelenius 3908160998 One big update for stacks. 2014-06-10 20:36:08 +04: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
Razharas 5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
Miauw 3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
Hornygranny 2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Miauw 0328f437ff finishes up nodrop as far as i can be arsed to 2014-02-15 16:22:25 +01:00
hornygranny 04aeb15af7 Rebalanced strange throwforces 2014-02-13 17:47:25 -08:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Miauw 8c7ef19be6 Replaced before_take_item() and drop_from_inventory() with u_equip 2014-02-12 19:51:37 +01:00
Hornygranny 01ce0f5392 Removed copypaste for cyborg metal sheets
Fixed typos
2014-01-17 15:45:09 -08: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
Kyrah Abattoir 7e2b7805cc FIXED: inconsistencies with stack item names.
CHANGE: stacks are gender = PLURAL by default because it fits.
2013-11-24 00:14:46 +01:00
Robson Richards 50c5e7ee74 Cleans up the new cyborg floortile, Thanks for spotting it Aran! 2013-09-24 15:55:06 +01:00