Commit Graph

302 Commits

Author SHA1 Message Date
D3athrow
e0bc7fc1ce Merge branch 'vamp-update' of https://github.com/VelardAmakar/vgstation13 into Bleeding-Edge
Conflicts:
	icons/mob/suit.dmi
2015-03-06 12:46:52 -06:00
D3athrow
c71f2a99b1 Not sure what happened here. 2015-02-27 15:56:48 -06:00
D3athrow
27e45c0fee machinery frames are now able to be deanchored and moved. 2015-02-27 14:43:52 -06:00
D3athrow
4ed84b0ebd Change magic numbers to defines for the catwalk/lattice/plating building. 2015-02-27 12:41:18 -06:00
D3athrow
e679fd97c1 Should fix cameras not resetting your view when canceling. 2015-02-26 15:58:07 -06:00
d3athrow
95de02d783 Merge pull request #3058 from clusterfack/fixes
Bugfixes
2015-02-16 21:35:52 -06:00
clusterfack
f7ff408232 Screw defines 2015-02-16 17:06:59 -06:00
ComicIronic
52861b41d2 Removes the STOPSPRESSUREDMG flag.
Replaced it with use of the atom-level var pressure_resistance.
Engineering, deathsquid, and ERT hardsuits now resist up to 20MPa of pressure, security and medical 4MPa, and soft suits 0.5MPa.
Pressure protection can now also come from items equipped in slots other than the head or suit.
2015-02-16 11:18:30 +00:00
ComicIronic
0de387d431 New flag, small jiggling, spell fixes. 2015-02-12 20:15:47 +00:00
ComicIronic
7babe603a4 Added some explanations to code. 2015-02-12 20:15:44 +00:00
ComicIronic
6b4270882a Added bitflags to spells.
Also made construct UI work under the new system.
2015-02-12 20:15:43 +00:00
ComicIronic
90aa65d308 Spell code rework: in progress.
Moved some code around, redid several spells to work under a standard system.
2015-02-12 20:15:43 +00:00
ririchiyo
4ffff3d8af Merge pull request #2748 from N3X15/snow-declassified
Snow - Declassified
2015-02-10 18:02:56 -05:00
d3athrow
dd62cc4dba Merge pull request #2918 from ComicIronic/DefInt
Changes intents to defines.
2015-02-09 21:05:27 -06:00
d3athrow
acab276c81 Merge pull request #2841 from ComicIronic/Hair
Moves BLOCKHAIR and BLOCKHEADHAIR to flags_inv
2015-02-09 21:04:30 -06:00
ComicIronic
7e75c6ae53 Changes intents to defines. 2015-02-09 20:25:52 +00:00
ComicIronic
572df81a2a Comment updates. 2015-02-09 18:55:04 +00:00
ComicIronic
68c5670014 Bump Code 2: Electric Bumpaloo
Mobs now have flags deciding what kind of mobs they can mess around with.
This means monkeys will no longer attempt to push humans. Hurrah for xenobio.
Fixes #2903, silicons can now push anything but can't swap with humans.
MoMMIs can swap with any mob but can't push any mob.
Added a proc and 3 vars to handle all this code.
2015-02-09 18:51:18 +00:00
d3athrow
9280727cbb Merge pull request #2822 from ComicIronic/TwoHand
Twohand system rework
2015-02-07 15:49:08 -06:00
D3athrow
1ddca63301 Fixes #2797
Resolves the photocopier issue for good.
Adds warnings to the preprocessor if you try to compile or run the server with a version below 507
2015-02-06 21:05:32 -06:00
ComicIronic
97be9bac3e Moves BLOCKHAIR and BLOCKHEADHAIR to flags_inv
Added another flag for just beards, and made HIDEHAIR the combination of the two.
Added two general procs for seeing if something is hidden. These can be used in the future.
2015-02-06 21:52:21 +00:00
ComicIronic
ba5c79b18c Twohand system rework. UNFINISHED.
Added general procs for wielding and unwielding.
Made code more OOP.
Any item can now be twohanded, and twohanding is now done by holding an item in one hand and clicking it with the other.
You can switch hands while wielding now, which is only useful in dropping the offhand to stop wielding.
Need to fix: gibtonite carrying doesn't want to work properly.
2015-02-05 23:02:39 +00:00
Rob Nelson
72e0aa0852 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into snow-declassified 2015-02-02 12:38:48 -08:00
Rob Nelson
116fd146c2 Getting this out of secret for less conflicts. 2015-02-01 19:31:47 -08:00
ComicIronic
02e5d32db4 Conflicto fuck off. 2015-01-31 11:40:57 +00:00
D3athrow
4b11190f82 AHH LIGHTS ARE OFF THE MACHINE LIST
FUCK THE MACHINE LIST
thanks aran
2015-01-30 20:22:58 -06:00
ComicIronic
dccd3ce3c5 Flag spelling fixes.
Why is PROTECTION PROTECITON?
Also DMAGE is now DMG.
2015-01-29 22:28:14 +00:00
D3athrow
62a729e40a Fuck you say code 2015-01-27 22:38:20 -06:00
D3athrow
19b54bd7b8 Should fix being able to understand mice.
Mice can understand human language but not the reverse.
To have a mob understand everything set languages to UNDERSTANDS_ALL or 1024
2015-01-24 13:09:30 -06:00
ComicIronic
21c415ad17 Merge conflicts and flags. 2015-01-20 22:34:26 +00:00
ririchiyo
2c69c0dc15 There's no way this done yet. 2015-01-12 08:45:52 -05:00
ComicIronic
0b982125cf Face part flag changes.
Removed the HEADCOVERSEYES, MASKCOVERSEYES, GLASSESCOVERSEYES, HEADCOVERSMOUTH, and MASKCOVERSMOUTH flags.
Added the EYES, EARS, and MOUTH flags for body_parts_covered.
Added a proc for getting the item giving a flag, instead of just checking that it's there.
Made borers check for the EARS flag, instead of using HIDEEARS.

Next on the chopping block is BLOCKHAIR and BLOCKHEADHAIR, which are going to be shoved into flags_inv.
2015-01-11 15:22:02 +00:00
Chris
268d82de31 Move defines to setup.dm 2015-01-10 21:43:48 -06:00
ComicIronic
92ebe71396 Removed the NOSHIELD flag.
Unused in code.
2015-01-08 19:08:21 +00:00
ComicIronic
53a421014d Removed USEDELAY and NODELAY flags.
Flags were unused.
Were previously used, but code is now commented out.
2015-01-08 00:47:52 +00:00
ComicIronic
9c9e1ff808 Removed the TABLEPASS flag.
No longer in use in any of the code.
Also changed cases of flags being set to null instead of 0.
2015-01-03 18:33:47 +00:00
d3athrow
70918ec4d7 Merge pull request #2372 from ComicIronic/FlagRedo
Removed the CONDUCT flag.
2015-01-02 13:44:02 -06:00
Chris
e1bfbe6237 Merge branch 'Bleeding-Edge' into singulo_adjustments
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/setup.dm
    code/modules/mob/living/living.dm
    code/modules/mob/living/carbon/human/human.dm
2015-01-01 11:04:49 -06:00
Rob Nelson
f1cadf6ef1 Mob movement/attack/click/special delay rework
This code was just a big fucking mess.  Happy motherfucking 2015.

 * Delay procs and variables replaced with a standardized delayer framework.
 * Cleaned up the absolutely fucking atrocious fix_next_move() diagnostic verb.
 * Added the ability to adjust minimum and maximum delay clamps per-mob for adminbus purposes and future features.
   * USECASE: Fat people cannot attack as fast (not implemented)

Tested somewhat by smacking a window with a crowbar.  Movespeeds also don't seem insane, either.
2015-01-01 03:21:23 -08:00
Rob Nelson
6ebd61ea1c Investigation Logging improvements.
* Adds "atmos" subject to Investigate.
 * Massive overhaul of Investigate, making it more modular.
 * Also replaced investigate_log with investigation_log, with swapped arguments (which makes more sense).
2014-12-30 21:48:36 -08:00
ririchiyo
c9f230302f adding singularity defines and adding some logging back to supermatter. 2014-12-27 13:49:12 -05:00
ComicIronic
5e5bbf03fd Removed the CONDUCT flag.
Use Siemens, you dolts.
This is the start of completely redoing the flag system, but it starts with removing these oldcode flags.
2014-12-26 18:13:52 +00:00
eswordthecat
28b96b307a Average temperature of universe. 2014-12-24 16:35:25 +08:00
d3athrow
0cc6307323 Merge pull request #2189 from ComicIronic/MiningPicks
Mining pick code cleanup
2014-12-19 16:56:09 -06:00
Rob Nelson
db9d2a6c37 [Hotfix] This fixes the pipe
#ifdef != #if

Fuck me I am dumb
2014-12-16 22:48:10 -08:00
ComicIronic
096511b9db Merge conflicts. 2014-12-16 18:31:35 +00:00
d3athrow
26626a1aa0 Revert "The winter update, part 2" 2014-12-16 12:15:01 -06:00
d3athrow
1ddc92bd4a Merge pull request #2173 from DeityLink/winter2
The winter update, part 2
2014-12-16 09:54:29 -06:00
ComicIronic
58b1575c34 Mechanic fixing.
PDA device analysers now work as expected.
Groundwork for fabricators ignoring design requirements, which general fabricators now do for chems.
Item designs based on existing designs now properly generate a plastic requirement.
Sped up the flatpacker a little to balance its costs.
2014-12-16 10:02:32 +00:00
DeityLink
f2b7f110b7 more 2014-12-15 23:31:09 +01:00