Commit Graph

4218 Commits

Author SHA1 Message Date
ZomgPonies
23a510b743 Merge pull request #1034 from tigercat2000/fluffclean
Clean out unused fluff items
2015-05-16 21:27:11 -04:00
ZomgPonies
572f364da4 Merge pull request #1054 from PJB3005/vg-masterrace
/vg/ Multitool Menu port + More things constructible + AAC
2015-05-16 21:26:54 -04:00
Tigercat2000
7eac7651db Stacks can now build on any simulated turf
This commit lightens the restrictions on stacks, so that they can now
build on any type of /turf/simulated instead of requiring
/turf/simulated/floor.

The primary intent of this commit is allowing people to build on shuttles,
as they are now considerably less "magical", given that they have
lighting, and glass sheets + metal rods already ignore these restrictions.
2015-05-16 11:41:44 -07:00
Tigercat2000
e232eb447c Rename cigs_lighters.dm to cigs.dm, to reflect lighters being seperated 2015-05-16 05:44:22 -07:00
Tigercat2000
0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07:00
Tigercat2000
9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
ZomgPonies
59ed4f69ad Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING
FIX: Attack logs being backwards
2015-05-16 07:52:33 -04:00
Tigercat2000
b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07:00
ZomgPonies
6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
Krausus
575ed36fdc Fixes eye stabbing runtime
This will allow eye stabbing to properly weaken victims.
2015-05-16 05:46:53 -04:00
Krausus
f575331f74 Fixes runtime in health analyzers 2015-05-16 03:36:22 -04:00
Krausus
224f0ff1d9 Fixes soap cleaning runtime
If you tried to clean an atom with soap, and that atom was deleted
before you finished cleaning, the message attempting to display its name
would runtime.
2015-05-16 02:14:34 -04:00
ZomgPonies
b823f3a99d Merge pull request #1072 from Fox-McCloud/those-fixes
Fixes and Tweaks
2015-05-15 22:35:25 -04:00
TheDZD
ed67e06c8d Merge pull request #1058 from ZomgPonies/apollo
Adds 2 new event species
2015-05-15 22:34:47 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
MrBauer24
47092f4c07 Made flares brighter
updates flares, made them brighter as per the request.
2015-05-16 01:10:43 +01:00
ZomgPonies
4ceb335a5e Snowflake fun removal 2015-05-15 15:36:39 -04:00
ZomgPonies
2c965aef08 Fixes reported issues. 2015-05-15 10:57:37 -04:00
FalseIncarnate
55087890de Brooms, Stick-horses, and Flying Wizards!
A port of https://github.com/d3athrow/vgstation13/pull/4377

![image](http://i.gyazo.com/dd415093be904dc9e5d40570598eddb9.gif)

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.

You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.

And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
Krausus
f5f15881c2 Fixes luminosity checks
They should now be more in-line with how they worked under the old
lighting system.
2015-05-15 01:07:08 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
PJB3005
257e77c400 /vg/ Multitool menu port!
With 100% better squashing.

I hope.
2015-05-14 22:34:02 +02:00
ZomgPonies
d62b3d3d77 Merge pull request #1040 from Robertha89/master
Anti-Meta
2015-05-14 09:45:34 -04:00
ZomgPonies
10db10584a Merge pull request #1038 from tigercat2000/corpor
MAP: Cyberiad, Corp jumpsuits, Engi curtains
2015-05-14 09:45:18 -04:00
Krausus
1e63811d0f Actually fixes medical item runtimes
They never checked whether the limb you're targeting actually exists,
which caused all sorts of runtimes all over the place
2015-05-14 08:28:41 -04:00
Krausus
6b4d8ec0b3 Fixes medical item runtime and a line git ate
That line was pretty important, git. Why, git.
2015-05-14 07:23:26 -04:00
Krausus
e9c32eefbe Fixes Check Bomb Impact runtime 2015-05-14 06:50:29 -04:00
Robertha89
036cbe39ab Anti-Meta
Updates crayon runes
http://i.gyazo.com/e98dc684ebd0a80711f7c796fb5aadbe.png
2015-05-13 17:56:57 +02:00
Tigercat2000
0a991322c3 MAP: Cyberiad, Corp jumpsuits, Engi curtains
This commit does the following:
 - Adds a corporate wardrobe to security, equipped with 3
   corporate jumpsuits and 3 corporate caps.
 - Changes the shower curtain on the engineering outpost from a regular
   curtain to an engineering curtain, because we have those now
2015-05-13 07:22:25 -07:00
Tigercat2000
fab7c48428 Fluff item removal: Compile fix
This commit removes an istype check that was causing compile errors, and
actually adds the updated .dme
2015-05-13 05:29:05 -07:00
ZomgPonies
ed8e0c7581 Merge pull request #1018 from tigercat2000/OhMyLights
Add light color defs for more things
2015-05-13 08:06:14 -04:00
TheDZD
a30d5953dd Merge pull request #1017 from ZomgPonies/superfix
Couple of superhero fixes
2015-05-12 15:11:51 -04:00
ZomgPonies
bd71606cf6 Merge pull request #1010 from tigercat2000/GAAB
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
Tigercat2000
7d103f5bd5 Add light color defs for more things
This commit adds custom color definitions to almost every computer that
did not already have them. It also causes cigarretes to very dimly glow.

Also contains custom colors for candles, flashlights, and the mentioned
cigarretes.

Oh, and beepsky flashes red and blue now while in hunt mode. FTW
2015-05-12 05:27:28 -07:00
ZomgPonies
2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
ZomgPonies
1b9cd2dfe4 Merge pull request #999 from Fox-McCloud/hiding
Potted Plant Hiding
2015-05-11 17:06:40 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Krausus
9d712fe623 Fixes pill bottles not grouping their contents 2015-05-11 09:11:11 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Krausus
64f39bb871 Fixes AIs and ghosts not being able to follow bots
This probably touches more files than it really should, but I can't
think of a better way to do it that isn't overhauling the saycode.
2015-05-11 06:38:14 -04:00
Tigercat2000
5ff292fe47 Flashlight icon fix
I left out an icon-updating line. Whoopsies.
2015-05-10 20:41:46 -07:00
Tigercat2000
40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm
2015-05-10 14:15:51 -07:00
Tigercat2000
625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
ZomgPonies
6610e0965e Merge pull request #983 from tigercat2000/water_act
Water_act system - for all your watery needs
2015-05-10 16:14:55 -04:00
ZomgPonies
23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Fox-McCloud
428dde8047 Potted Plant Hiding 2015-05-10 14:41:06 -04:00
Tigercat2000
b7b13f15a4 Merge remote-tracking branch 'upstream/master' into water_act
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2015-05-10 05:41:52 -07:00
Tigercat2000
27442f9539 Water_act: Wetlevel for carbon mobs
All carbon mobs have a new variable called wetness, which is increased
upon water_act's that have a volume over 10, and is decreased every 22~
cycles of mob_master.

This variable currently does absolutely nothing but change their examine
text.
2015-05-10 05:39:26 -07:00