9e0d053143
fixes conflicts
2016-05-10 04:12:55 +01:00
6560ec9bc6
Merge pull request #4380 from Fox-McCloud/simple-animal-damage
...
Simple Animal Damage Fix+Change
2016-05-09 21:23:50 -04:00
a421a6dd3a
Makes Load Slots dialog come up on top of Character Preferences
2016-05-09 20:34:23 -04:00
b63954fa8d
Merge pull request #4387 from tigercat2000/character_menu_redesign
...
Preference Screen Overhaul
2016-05-09 19:18:29 -04:00
be16c5612c
Merge pull request #4386 from Fox-McCloud/emote-fixup
...
Emotes work when not in lowercase
2016-05-09 19:13:11 -04:00
596485e304
Merge pull request #4385 from FlattestGuitar/tapegag
...
Tape gags for all
2016-05-09 19:12:53 -04:00
3e4c7a77bd
Merge pull request #4381 from Tastyfish/macros-macros-everywhere
...
Some math, mob helper, etc one-liner optimizations
2016-05-09 19:07:13 -04:00
10780aa200
Adds pAIzing
2016-05-10 00:02:55 +02:00
4f8c42484e
Refactors Species Gun Handling
2016-05-09 16:31:51 -04:00
67bee9ad5f
missing ones
2016-05-09 03:10:40 -04:00
f73ec5a20e
Removes Players Ready From Lobby
2016-05-09 02:11:53 -04:00
6b5aac8aee
Fixes ignoreRest param, AStar
2016-05-08 23:47:51 -04:00
b7d2b6d3f6
Merge pull request #4398 from Tastyfish/vamapff
...
Fixes Create Antagonist panel's vampire thing
2016-05-08 22:49:54 -04:00
604abcf9fc
Fixes Create Antagonist panel's vampire thing
2016-05-08 22:15:27 -04:00
f0520a2ed4
The first playable version of the Refactor
...
Pods are single seat because nothing is in to expand max_occupants yet.
Everything else works as intended however and there don't appear to be
any runtimes in my testing.
2016-05-08 18:37:27 -05:00
85a583f126
Merge pull request #4287 from Fox-McCloud/science-update-II
...
Science Rebalance Round II
2016-05-08 13:02:04 -04:00
0dc4a3118a
Fixes resisting, "Mphmmmph!"
2016-05-08 14:15:29 +02:00
f63328262f
Completes Stage One of Occupant Refactor
...
Occupants are now members of a list with a maximum size and a special
associative tag for pilots. Gating the verbs and testing is still
needed.
2016-05-08 04:24:48 -05:00
e61d774a7c
Makes emotes case insensitive ( #4386 )
...
Also prevents unconscious emoting
2016-05-08 05:34:31 +01:00
2474b73376
Merge pull request #4377 from QuinnAggeler/drask-fluff
...
Drask fluff additions
2016-05-07 22:55:40 -04:00
1441c472b5
Merge pull request #4371 from tigercat2000/better_blueprints
...
Ports holomap blueprints from tg/vg.
2016-05-07 22:54:52 -04:00
f147a0ea53
Merge pull request #4367 from tigercat2000/why_would_you_do_this
...
Makes the "lightbulbs don't burn you" thing less awful
2016-05-07 22:02:48 -04:00
73863e0721
Merge pull request #4376 from IK3I/Decalock-Fix
...
Fixes Decalocks in abandoned crates
2016-05-07 22:01:48 -04:00
6d8c7f6777
Cleans references to Occupant2
...
Prepares for list based occupancy
2016-05-07 15:59:24 -05:00
8104a69a51
Moves pod code to modules where it belongs.
2016-05-07 15:59:01 -05:00
805c81f3ab
smh, vox
2016-05-07 19:37:33 +02:00
b43116ca87
Mumbles
2016-05-07 19:18:18 +02:00
ab872ff2f8
move flavor text below nt relation
2016-05-07 09:30:48 -07:00
1ca3ac3e7a
More preference menu organizing
2016-05-07 09:25:24 -07:00
7c2d6b7cb9
Preference Screen Overhaul
...
Reorganized the character preference screen.
2016-05-07 08:50:12 -07:00
45596f7381
refactor
2016-05-07 11:48:51 -04:00
62637145c5
*insert coherent commit description here*
2016-05-07 17:18:46 +02:00
73ae1cdce3
simple animal health fixes
2016-05-07 11:10:40 -04:00
91d3757944
Rebalanced, unsnowflaked
2016-05-07 17:02:03 +02:00
83b522e289
Emotes work when not in lowercase
2016-05-07 10:29:32 -04:00
48888c891c
Tape gags for all
2016-05-07 15:02:38 +02:00
b6ef174c07
Simple Animal Damage Fix
2016-05-07 01:28:11 -04:00
d209f66814
Adds a banner/flag for the Drask, like the other races have
2016-05-06 20:50:31 -07:00
cd3381d0a0
Merge pull request #4356 from FalseIncarnate/botany
...
Briefcase Full of BEES!
2016-05-06 23:28:11 -04:00
6f240e7ea4
Abductor Spelling Correction Fix
2016-05-06 21:03:24 -04:00
4b835f6c1e
Adds an emote for Drask talk sounds, gives them the ability to eat soap
2016-05-06 16:42:50 -07:00
6035615cab
Turns out loops need to be initialized....
2016-05-06 18:25:02 -05:00
a96f9e4360
Fixes Decalocks in abandoned crates
...
-also adds some string based recursion helpers
2016-05-06 17:58:45 -05:00
f5c35a6486
Merge pull request #4357 from Fox-McCloud/chem-stuff-disease
...
A Few More Disease and Reagents
2016-05-06 18:12:18 -04:00
7838d1b147
living slowed
2016-05-06 18:02:09 -04:00
82a9612653
Some math, mob helper/ one-liner optimizations
2016-05-06 04:38:59 -04:00
52bc145c17
botany and more reagents
2016-05-06 03:43:31 -04:00
a68ddb1116
Global Intercom list, minor code cleanup round 2
2016-05-06 03:20:00 -04:00
bee2954d7b
Ports holomap blueprints from tg/vg.
...
Changes:
- Clicking "view structural data" in the station blueprints menu will
show you ghost images of where things like disposal pipes, wires,
atmospherics pipes, and other power machinery are originally supposed
to go. Note, this will show you the ghost images over turfs even if the
machinery is destroyed.
2016-05-05 22:05:39 -07:00
75b1af6a39
Merge pull request #4369 from Tastyfish/magic-gloves
...
Fixes floating gloves on UI
2016-05-05 22:57:21 -04:00
VampyrBytes