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
IAmBigCoat
86cc3b390e
Merge branch 'master' of git@github.com:ParadiseSS13/Paradise.git
2015-05-11 01:34:45 -04:00
IAmBigCoat
dd9b6ebd4f
Scrub/Supply caps and a small schema fix
2015-05-11 01:09:00 -04:00
ZomgPonies
f6a88fa251
Merge pull request #1005 from Fox-McCloud/LINDA-Fix
...
LINDA-Fix: Mobs On Fire
2015-05-11 00:46:21 -04:00
Tigercat2000
5ff292fe47
Flashlight icon fix
...
I left out an icon-updating line. Whoopsies.
2015-05-10 20:41:46 -07:00
Fox-McCloud
99f315c87c
LINDA-Fix: Mobs On Fire
2015-05-10 22:42:57 -04:00
ZomgPonies
0eed6e97ee
Merge pull request #1004 from tigercat2000/ShuttleComfyChairFix
...
Fix comfychairs having custom icon_states
2015-05-10 22:01:06 -04:00
Fox-McCloud
e2ee01b621
Black Powder Sound Tweak
2015-05-10 21:51:50 -04:00
Tigercat2000
b74767f1c9
Fix comfychairs having custom icon_states
...
This commit removes all custom icon_states from comfy chairs placed on the
map. They are remenants of an old system and mappers ignoring what they
are doing when placing things.
2015-05-10 18:50:09 -07:00
Tigercat2000
fd799d6844
Starlight
...
This commit ports baystation12's implementation of starlight, modified to
rely on the master-controller due to differences between us, -tg-, and
bay12. Starlight allows space tiles to give off light, the amount of light
can be configured in config.txt.
2015-05-10 18:31:21 -07:00
Fox-McCloud
adf8f2d909
Merge pull request #1001 from ZomgPonies/reflec
...
Fixes reflecting projectiles
2015-05-10 20:19:31 -04:00
ZomgPonies
6fe5db524a
Fixes reflecting projectiles
2015-05-10 20:10:27 -04:00
ZomgPonies
1ecdb14fa3
Merge pull request #987 from Fox-McCloud/unathi-tail
...
Adds in Unathi Tail Wagging
2015-05-10 19:59:41 -04:00
ZomgPonies
44cba43cbc
Merge pull request #986 from Robertha89/patch-4
...
Updating Resource to /tg/ standars along with factory
2015-05-10 19:59:10 -04:00
Tigercat2000
c2038640f7
Lighting Overhaul Map stuff
...
This commit fixes up the map to account for the new shuttle lighting
system brought by the lighting overhaul.
Things changed:
- Shuttles now all have lightbulbs in them
- Syndicate Mothership now uses lighting as well, for a dark-forest look.
2015-05-10 16:58:41 -07:00
ZomgPonies
cc679371c3
Merge pull request #985 from tigercat2000/WeaponCleanup
...
Cleanup code/defines/ folder.
2015-05-10 18:39:00 -04:00
ZomgPonies
6aee3366ff
Merge pull request #984 from tigercat2000/Pfixes
...
Pool Controller update: Hippie Edition
2015-05-10 17:45:56 -04:00
Fox-McCloud
1325bd562e
tweak 2.0
2015-05-10 17:42:25 -04:00
Tigercat2000
82d615f5b3
Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
...
Conflicts:
code/game/atoms.dm
2015-05-10 14:28:03 -07:00
Tigercat2000
e7ec8a7e2d
Compile-fix
2015-05-10 14:21:44 -07:00
Fox-McCloud
1e32bd1205
Species Touchups
2015-05-10 17:19:22 -04: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
92c5d0139a
Fix hydroponics to use the right light system
...
This commit updates hydroponics to the new light system, so it stops
compile-error'ing
2015-05-10 14:09:57 -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
68d4b98af4
Merge pull request #996 from Robertha89/patch-5
...
Adds service radio to ai
2015-05-10 16:15:58 -04:00
ZomgPonies
8a3c2ef2fe
Merge pull request #993 from Fox-McCloud/ooooops
...
Health Analyzer Name Fix
2015-05-10 16:15:41 -04: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
Tigercat2000
4642f76d33
Colored Fire
...
This commit adds a colored fire system based on baystation12's system.
2015-05-10 13:12:22 -07:00
ZomgPonies
45d433c50c
Merge pull request #982 from tigercat2000/anothergibberthing
...
Autogibber, Gibber patches
2015-05-10 16:07:21 -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
a46518f120
Increase very low probability to escape grabs
...
This commit raises two probability values in resist code, namely for
resisting out of grabs. The previous probabilities were 25 and 5, they are
now 60 and 15.
2015-05-10 12:09:58 -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
428dde8047
Potted Plant Hiding
2015-05-10 14:41:06 -04:00
Robertha89
6cda382c5e
Adds service radio to ai
...
Fixes an oversight.
2015-05-10 17:10:17 +02:00
Tigercat2000
0e948ffeec
Remove Jointbreaking, Joint fracturing, and Knifing
...
This commit removes Jointbreaking, Joint fracturing, and Knifing from the
grab system due to near-universal dislike of the features.
2015-05-10 06:46:58 -07: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
Fox-McCloud
2ac1304df5
Health Analyzer Name Fix
2015-05-10 05:59:03 -04:00
Fox-McCloud
73838ac55d
Merge pull request #991 from ZomgPonies/expfix
...
Fixed mobs not taking damage from explosions
2015-05-10 00:27:53 -04:00
ZomgPonies
533841c0a5
Fixed mobs not taking damage from explosions
2015-05-10 00:19:28 -04:00
IAmBigCoat
65bb1b4956
Merge branch 'master' of git@github.com:ParadiseSS13/Paradise.git
2015-05-10 00:11:51 -04:00
Fox-McCloud
0b66bf725f
Merge pull request #979 from ZomgPonies/explosion
...
Ports VG's DeityLink's new explosion method
2015-05-09 23:42:02 -04:00
Fox-McCloud
8f2580a208
animation upadte
2015-05-09 23:00:11 -04:00
ZomgPonies
2fdfbc729f
Merge pull request #988 from tigercat2000/Spesswind
...
Add magboots stopping airflow push to LINDA
2015-05-09 22:40:49 -04:00
Tigercat2000
bccabe6d4f
Add magboots stopping airflow push to LINDA
...
This commit adds an airflow push override to humans, which triggers when
the shoes they are wearing are a subtype of magboots and magpulse is
active. Therefore, magboots will prevent people from being pushed around
by "spacewind" or also known as airflow.
2015-05-09 19:23:10 -07:00
Fox-McCloud
dbaf893fe6
Merge pull request #971 from Krausus/QuickDumping
...
Improved Dumping for Containers
2015-05-09 20:33:06 -04:00
Fox-McCloud
5f544648c8
Adds in Unathi Tail Wagging
2015-05-09 20:28:07 -04:00
Robertha89
4366f5f819
Updating Resource to /tg/ standars along with factory
...
title, makes resource nodes far better. should pick up the drag that is costing resources to send blob to corpse.
2015-05-10 02:24:12 +02:00
Tigercat2000
595f24bd1b
Cleanup /defines/ folder.
...
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm.
These files were only kept for legacy compatibility and do not fit into
the tree system at all. It doesn't even make sense since the base defines
are all that were in these, the actual code for the items was in the right
file.
Any new ports that use this file on a different codebase should be sorted
into the tree system anyways, new files if necessary. A giant defines
file is just wasting space and searching effort.
2015-05-09 16:06:59 -07:00
Fox-McCloud
be13c080e8
Merge pull request #975 from ZomgPonies/pixelfire
...
Pixel travel projectiles. WIP
2015-05-09 18:34:57 -04:00
