Commit Graph

62 Commits

Author SHA1 Message Date
Mandurrrh 48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
dannno 9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno 23ecfeebf8 THE OWL RETURNS: PART 4: PRODUCT PLACEMENT
- adds The Owl and The Griffin prize toys to the arcade
- adds The Owl and The Griffin posters (legit and contraband respectively)
- adds The Nest barsign
2015-02-26 16:36:44 -05: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
paprka d6dce069f4 finally actually fixes the blood decals 2015-02-01 00:29:37 -08:00
paprka 0b64a23310 fixes blood drips 2015-01-31 23:40:27 -08:00
paprka a661e58281 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
paprka f071655ea4 updates and optimizations 2015-01-24 01:12:57 -08:00
paprka 1cdd5f011f blood for the blood god 2015-01-20 19:17:59 -08:00
Razharas f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening
Guns: the gunnening
2014-12-11 10:46:34 +03:00
Swag McYolosteinen bff2e62a0f Merge pull request #6175 from Razharas/ExActFix
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
Razharas 7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
paprka 2425903320 intial commit, renames stechkin 2014-12-04 18:13:50 -08:00
phil235 656a533b1a Fixes being able to rip posters more than once by opening multiple confirmation windows beforehand. 2014-12-02 20:44:28 +01:00
Razharas ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
tkdrg b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
Lo6a4evskiy 18ad0292c3 fixed compilation errors 2014-10-07 12:47:53 +04:00
Lo6a4evskiy 41eb04356f Merge remote-tracking branch 'upstream/master' into Custom_graffiti
Conflicts:
	code/game/objects/effects/decals/crayon.dm
2014-10-07 12:43:59 +04:00
MrPerson 651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Lo6a4evskiy b5f0753c8f Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown. 2014-09-28 14:02:08 +04:00
Lo6a4evskiy 8ab6bf0c15 Super Awesome Crayons! 2014-09-24 22:19:12 +04:00
Lo6a4evskiy 82e1ce9141 Choosing graffiti instead of drawing random one 2014-09-16 20:57:24 +04:00
JStheguy ae64c526ad Okay yeah some changes
Error posters link to /tg/ issues page now.
Also syndie revolvers have 7 shots so yeah change because facts
2014-08-27 07:14:43 -05:00
JStheguy 0dc184004c NT Poster Port
-Adds all them NTstation posters and the poster subtype system.
2014-08-26 19:03:03 -05:00
MrPerson d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
Firecage 22743b77f4 Adds asbolute paths to some effect files. 2014-08-07 18:59:06 +02:00
MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm
2014-06-09 01:50:44 -07:00
MrPerson 9d9a657acf Change examine() from an atom verb to a mob verb
Just in time for the feature freeze, a big change that will introduce bugs! Yay!
Mob verb is called verb/examinate(target), which just calls target.examine(user) and face_atom(target)
For explanation why, see http://www.byond.com/forum/?post=1326139&page=2#comment8198716
Long story short, mob verbs are much faster than object verbs. The goal is to make right-click menus populate faster.

Also changes a bunch of examine() procs to always, ALWAYS call the parent. Except mobs, but you have 1 guess why I'm not touching them. Mostly this affects obj/item/examine().
And also remove a whole shitload of pointless set src in view(2) kind of crap. Also span classes.
2014-05-01 09:56:39 -07:00
Cheridan f83f1932b2 Meteor code uses OOP principles a little better now
Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
2014-04-23 01:37:44 -05: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 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
Giacomand 11bca59614 Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00:00
Nienhaus ab76fe339d Forgot a .
...
2013-12-18 00:11:26 -06:00
Nienhaus 70b0252797 Holy fuck English
I hate what I speak.
2013-12-18 00:10:30 -06:00
Nienhaus 47fab14f9f Very English!
I suck at spelling and grammar.
2013-12-18 00:00:15 -06:00
Nienhaus 8bf9e63966 Posters
Hey look, Posters!
http://puu.sh/5QlUx.dmi
Image
2013-12-17 23:36:56 -06:00
Kyrah Abattoir 109c1065c7 code/game/objects/effects/* lowercase pass
NOTE: created a baseclass for /obj/effect/decal/remains/*
2013-11-20 18:03:41 +01:00
VistaPOWA 620cdb8566 Removes extra var from decals
oops that wasn't meant to be included
2013-09-30 22:32:42 +02:00
VistaPOWA b5fff895ee Makes decals disappear after an explosion
Fixes runes, dirt, blood, etc remaining and floating in space after an
explosion.
Gibs are excluded from this change.
2013-09-30 20:19:41 +02:00
VistaPOWA 881a895bd6 removes extra unused code 2013-09-17 18:03:01 +02:00
VistaPOWA 5a2bb3fbf7 Finalizing blood trails
Makes trail_holder a child of cleanables instead of blood (this is to
allow add_blood turf proc to spawn blood splatter on blood trails, also
other kinds of blood effects), also cleaned up the blood code a bit.

Big props to Aranclanos, Cheridan, Pewtershmitz and all other coders on
#coderbus for making this happen.
2013-09-17 00:57:37 +02:00
VistaPOWA 1da8b659ff blood trails now stack
--DO NOT MERGE STILL WIP--
Makes blood trails use overlays, the overlays are contained in a holder
object. DNA is now properly added to them.

todo: redo light, xeno light and xeno heavy trails. help of spriters is
welcome.
2013-09-12 19:25:21 +02:00
VistaPOWA 214ae08073 Adds directional blood trails
The blood trails now follow the path the body has taken and players can
very easily make out said path.
Heavily damaged corpses will have a much thicker blood trail than
corpses with some brute damage. At the moment, trails overwrite
eachother and a placeholder icon set is used for alien heavy blood
trails.
2013-09-03 00:03:01 +02:00
Jordie0608 a4e7a62b46 Commit
Borg Rechargers decon-able. RIP Badger poster
2013-07-24 15:11:52 +10:00
carnie 4c10f5f94b Fixes #609 - decal/point is now unclickable.
Modified   code/game/objects/effects/decals/misc.dm
2013-05-21 08:41:50 +01:00
Pete Goodfellow a691679254 Fixed poster duplication when you cut it from the wall. 2013-04-18 19:57:54 +01:00
Cheridan c795b05d97 Minor chems update.
-Spraybottle chempuffs will now pass over tables.
-Further reorganization of chemistry reagents. Organizes toxic chems into subtypes. This cuts down on copied code and allows us to do fun things in the future, like machines that filter poisons and such.
2013-03-27 19:08:45 -05:00
Pete Goodfellow 2b3c769662 Makes /obj/effect/decal/cleanable/dirt mouse_opacity 0, as it covers the whole tile and prevents people from crowbarring it up.
It can still be cleaned by mopping the tile.
2013-03-24 16:01:49 +00:00
petethegoat@gmail.com 8ff7285645 Updates HUD stuff!
The main goal was to remove all the pointless shit in the UI style dmis, but this commit actually goes a bit deeper than that.

Formally renames the "hurt" intent to "harm", in line with everything else in the world.

Removes the old screen1_... .dmis. They've been replaced with screen_... .dmis. They function much the same.
screen_gen.dmi is used for things which apply to multiple UI styles, such as storage slot sprites, or the intent selector. (These can still be overridden in HUD code, though.)

Item action buttons have been changed to use a template from the UI style, and the icon_state of the item.
var/icon_action_button has been removed- varvar/action_button_name must be used instead to add action buttons for items.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5826 316c924e-a436-60f5-8080-3fe189b3f50e
2013-03-08 21:32:00 +00:00
giacomand@gmail.com cd2fcfc920 -Fixed blood vomiting not hurting you.
-Removed an unneeded fingerprint proc.
-Fixed some of the blood/vomit/gibs spills not correctly processing.
-Reduced the life of a virus with no mob host.
-You can now tell how a virus spreads by the Pandemic.
-Made making vaccines quicker and making blood virals quicker too.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5232 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-30 16:37:35 +00:00