Commit Graph

267 Commits

Author SHA1 Message Date
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
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
Tigercat2000
993ad208a8 Overhaul global defines and vars
This commit overhauls the global.dm file, global_lists.dm file, and
defines.dm file into a tree system based on -tg-.

All defines have been split and distributed in code/__DEFINES/

Everything from global.dm and global_lists.dm has been split and
distributed in code/_globalvars

The _compile_options.dm file contains anything that absolutely, 100%, must
be initialized before world.dm.

Name definitions have been moved to code/_globalvars/lists/names.dm.

Other things to note
 - All instances of something.z == 2/1/3/5 have been replaced with easily
   configurable defines, labeled ZLEVEL_. The map include file can
   override these by defining custom ones in it's file, as it is at the
   top of the tree.
2015-05-12 20:48:38 -07: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
7733df9e6b Asteroid Temp Change 2015-05-01 17:03:37 -04:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Fox-McCloud
b5fe239c24 Asteroid Temp Fix 2015-04-25 15:36:21 -04:00
Fox-McCloud
286a1ad5df [Goonchem] Food Reagents 2015-04-10 04:46:50 -04:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
jack-fractal
a0be969870 Unifying tech levels
Unifies tech levels between design and their products.
2015-04-06 22:07:44 -04:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
Fox-McCloud
60d4038ed5 Comfy Mining Turfs? NO! 2015-03-04 17:56:30 -05:00
ZomgPonies
8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
886bf7400b Final crafting fixes 2015-02-22 02:24:53 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
ZomgPonies
554765f49a Merge pull request #342 from Fox-McCloud/MiningSounds
Mai Immershun
2015-02-20 07:42:34 -05:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
DZD
d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31 Merge pull request #331 from Markolie/master
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
Markolie
46c53be6f1 Part 2 of saycode/language/species port from Bay. Also includes bugfixes. 2015-02-20 00:50:28 +01:00
Fox-McCloud
beae1bbe0f Mai Immershun
The hills are filled with the sounds of mining
2015-02-18 23:14:28 -05:00
DZD
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00
DZD
fbd9c367c0 NODROP flag addition & handling
- Purges canremove
- Implements functionality for NODROP flag, replaces canremove
- Refactors mob inventory unequipping.
2015-02-18 13:22:41 -05:00
ZomgPonies
97f80d0f5b Merge pull request #323 from Fox-McCloud/Sounds
Sounds
2015-02-17 18:44:54 -05:00
Fox-McCloud
a03879d83f Sound Updates 2015-02-16 16:29:43 -05:00
Markolie
8726bad5b0 Z-level check refactor 2015-02-16 20:33:28 +01:00
Markolie
0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
DZD
b3a0c9a975 Removes TABLEPASS and FPRINT flags
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
2015-02-10 17:41:37 -05:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
8fae0f029f Accessory overhaul 2015-02-08 14:29:10 +01:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -05:00
Markolie
28d55b9b42 Labor ore chance changes 2015-01-16 22:34:19 +01:00
Markolie
e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Fox-McCloud
be1d527069 Borg Modules 2015-01-10 21:41:41 -05:00
Fox-McCloud
525bb1a96f Stun Changes 2014-12-30 12:30:14 -05:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
SamCroswell
a1959291b7 Coin Flipping! Also more map fixes. 2014-12-04 17:12:41 -05:00
melandor0
72196cd272 Merge pull request #119 from ZomgPonies/master
sync
2014-11-24 02:45:57 +01:00
SamCroswell
211023bd67 Syndicate Medibots, Energy Recharge Fix
- Adds the ability to construct Syndicate Medbots, which were previously
in the code but unable to be constructed. These bots will only heal
Syndicate Nukeops, and can only be made from the medikit box that
Nukeops can purchase.

- Fixed recharging in energy crossbows and laser tag guns, they were
recharging 10x slower than they were meant to.
2014-11-08 19:16:33 -05:00
melandor0
01cc6409e7 supermatter drill
New traitor item
2014-11-06 19:28:34 +01:00
PJB3005
e5e9013ab4 make bananium smeltable
exactly as the title says, though, the smelter menu calls it 'clown',
because the oretag is clown, didn't fix it, because i dont know what
things use the oretag variable(i know some), and didn't want to break
anything over such a small bug
2014-09-24 15:15:56 +02:00
ZomgPonies
24b78b69be Use absolute paths next time 2014-08-16 18:11:49 -04:00
iamgoofball
4330a339cd beep book goonfabs 4 i fucking hate git etc etc. 2014-08-14 12:27:15 -07:00
Regory
ce7d05ccf3 Fix errors from ticker initializing after map ore
Ores only count towards the station's score if it spawns on Z=5 (Mining
Asteroid Level).  The old method caused errors in the server log because
gameticker/ticker initialized after the map ore spawns.

This also means that ore mined on the Clown Planet don't count.
2014-08-04 16:24:00 -04:00
Regory
109754ac2b Track Ore Mined for Scoreboard
Increments the score for ore mined each time ore is mined (i.e.:
spawned) after the game starts.
2014-08-04 12:00:44 -04:00