Commit Graph

197 Commits

Author SHA1 Message Date
xxalpha 7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
AnturK ed47afaa05 Fixes crayon/spraycan buffer mode. 2016-02-07 13:18:10 +01:00
Bjorn Neergaard 063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
xxalpha 9154e6cbf2 ultra range again 2016-02-03 07:58:41 +00:00
Bjorn Neergaard e750a06cde Remove old helper, fix tank dispenser icons. 2016-01-25 12:03:15 -06:00
MrStonedOne b50e8d2a63 removes a bunch of unneeded spawns
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
tkdrg 28cacc55c7 Merge pull request #14099 from AnturK/crayonstuff
Adds buffered writing mode to crayons/spray cans.
2015-12-28 18:47:47 -03:00
AnturK 47a7a9656c Makes the write default to current buffer 2015-12-28 11:17:40 +01:00
AnturK 8962334555 Adds buffered writing mode to crayons/spray cans. 2015-12-27 20:52:23 +01:00
KorPhaeron a0923daa0e Removes NOSHIELD 2015-12-20 15:21:58 -06:00
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 392ca2a505 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold 2015-12-15 16:54:22 -05:00
bgobandit a1634f2b51 Santa will no longer deliver the parent types of action figures. Certain action figures will now play appropriate sounds. 2015-12-14 14:32:27 -05:00
KorPhaeron d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
MMMiracles 50db868f63 lets try that again 2015-12-11 22:54:07 -05:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
bgobandit 984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
duncathan salt 0472592b97 Merge pull request #13327 from KorPhaeron/reactive
check_shields() refactor
2015-12-07 19:58:17 -06:00
MMMiracles 8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
Conflicts:
	icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
MMMiracles 6ac96194ba snow stuff. 2015-12-04 18:52:17 -05:00
Razharas 41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
octareenroon91 3693759187 Correct crayon comment
For /obj/item/toy/crayon , uses == 0 means a mundane crayon has been used up.
Uses < 0 implies unlimited uses.
2015-12-02 11:38:38 -06:00
KorPhaeron 2609adb29d Blocking overhaul 2015-11-30 16:22:31 -06:00
kingofkosmos edb611f53d Adds in-hand sprites for tracking beacon, pizza box and carp plushie. 2015-11-29 16:43:52 +02:00
octareenroon91 d2fa527045 Add numbers and star graffiti to crayon/spraycan designs. 2015-11-19 17:24:09 -06:00
Razharas e9dae3be88 Merge pull request #13015 from SuperSayu/Holodecker
Holodeck Upgrades [MAP]
2015-11-16 04:51:49 +03:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
duncathan salt 31e30ab768 Merge pull request #12955 from CosmicScientist/FixingThePast
Makes the dehydrated carp less ambiguous and decreases its TC cost
2015-11-14 23:42:58 -06:00
duncathan salt 9339662a28 Merge pull request #12768 from xxalpha/windows10
Made it possible to paint windows to make them opaque.
2015-11-11 10:32:18 -06:00
CosmicScientist af74475cad Because I cannot bear it. 2015-11-10 23:41:59 +00:00
NikNakFlak 998bcb3aed Makes fixes Jordie totally didn't do himself 2015-11-08 23:15:38 -07:00
NikNakFlak e624574c65 Ports action figures pew pew pew 2015-11-07 18:40:45 -07:00
xxalpha 9f4db8078b Made it possible to paint windows to make them opaque.
Not tinted windows

Changed how painting and opacity work.

Clean timer
2015-11-01 16:26:54 +00:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
xxalpha e82a216447 Changed various instances of range() and orange() to ultra_range(). 2015-10-19 20:04:14 +01:00
Razharas 54d9e6924d Merge pull request #11868 from bgobandit/diditallforthelewdbe
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
bgobandit db2f4d4a6a Adds kitty mousey toys! :3 2015-09-18 22:51:41 -04:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Xhuis 0b25b9e3b8 Fixes oversight 2015-08-26 18:03:13 -04:00
Xhuis 8f7f540a3b Fixes code errors 2015-08-26 17:39:59 -04:00
Xhuis fdc060a015 Xenomorph action figure 2015-08-26 17:33:59 -04:00
bgobandit 3ec42691b8 Adds more feedback to traitor dehydrated space carp. Fixes spelling. 2015-07-26 00:00:04 -04:00
phil235 2833f59f5f A typo and a forgotten thing to do. 2015-07-19 22:16:09 +02:00
phil235 94d072828f Merge branch 'master' of https://github.com/tgstation/-tg-station into CatchThrownPieFix
Conflicts:
	code/game/atoms_movable.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/weapons.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/living_defines.dm
	code/modules/reagents/reagent_containers.dm
2015-07-19 21:53:39 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235 b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Ikarrus 25b134581b Resolved Conflicts:
code/game/gamemodes/gang/gang_pen.dm
2015-07-02 15:15:41 -06:00
Ikarrus 2191a2c33d Datum-Based Gangs 2015-07-02 15:12:55 -06: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